diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/chrome/browser/resources/settings/settings.html | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/chrome/browser/resources/settings/settings.html')
| -rw-r--r-- | chromium/chrome/browser/resources/settings/settings.html | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chromium/chrome/browser/resources/settings/settings.html b/chromium/chrome/browser/resources/settings/settings.html index 231b3d94e89..c3cdadf9704 100644 --- a/chromium/chrome/browser/resources/settings/settings.html +++ b/chromium/chrome/browser/resources/settings/settings.html @@ -4,9 +4,8 @@ <meta charset="utf-8"> <title>Settings</title> <base href="chrome://md-settings"> - <script src="chrome://resources/js/polymer_config.js"></script> - <script src="chrome://resources/js/load_time_data.js"></script> - <script src="chrome://md-settings/strings.js"></script> + <link rel="import" href="chrome://resources/html/polymer_config.html"> + <link rel="import" href="chrome://md-settings/i18n_setup.html"> <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> <link rel="import" href="chrome://md-settings/settings_ui/settings_ui.html"> <link rel="import" href="chrome://md-settings/prefs/prefs.html"> @@ -15,8 +14,8 @@ <dom-module id="cr-settings"> <template> - <cr-settings-prefs id="prefs" prefs="{{prefs_}}"></cr-settings-prefs> - <cr-settings-ui prefs="{{prefs_}}"></cr-settings-ui> + <settings-prefs id="prefs" prefs="{{prefs_}}"></settings-prefs> + <settings-ui prefs="{{prefs_}}"></settings-ui> </template> <script src="settings.js"></script> </dom-module> |