Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: chrome/browser/resources/options2/options.js

Issue 10391044: retry 136193 - convert localStrings to loadTimeData for options page (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: plugins, ui_account_tweaks fixes Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 var AddLanguageOverlay = options.AddLanguageOverlay; 5 var AddLanguageOverlay = options.AddLanguageOverlay;
6 var AlertOverlay = options.AlertOverlay; 6 var AlertOverlay = options.AlertOverlay;
7 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay; 7 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay;
8 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay; 8 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay;
9 var AutofillOptions = options.AutofillOptions; 9 var AutofillOptions = options.AutofillOptions;
10 var BrowserOptions = options.BrowserOptions; 10 var BrowserOptions = options.BrowserOptions;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 cr.ui.decorate('input[pref][type=text]', options.PrefTextField); 45 cr.ui.decorate('input[pref][type=text]', options.PrefTextField);
46 cr.ui.decorate('input[pref][type=url]', options.PrefTextField); 46 cr.ui.decorate('input[pref][type=url]', options.PrefTextField);
47 cr.ui.decorate('button[pref]', options.PrefButton); 47 cr.ui.decorate('button[pref]', options.PrefButton);
48 cr.ui.decorate('#content-settings-page input[type=radio]:not(.handler-radio)', 48 cr.ui.decorate('#content-settings-page input[type=radio]:not(.handler-radio)',
49 options.ContentSettingsRadio); 49 options.ContentSettingsRadio);
50 cr.ui.decorate('#content-settings-page input[type=radio].handler-radio', 50 cr.ui.decorate('#content-settings-page input[type=radio].handler-radio',
51 options.HandlersEnabledRadio); 51 options.HandlersEnabledRadio);
52 cr.ui.decorate('span.controlled-setting-indicator', 52 cr.ui.decorate('span.controlled-setting-indicator',
53 options.ControlledSettingIndicator); 53 options.ControlledSettingIndicator);
54 54
55 localStrings = new LocalStrings();
56
57 // Top level pages. 55 // Top level pages.
58 OptionsPage.register(SearchPage.getInstance()); 56 OptionsPage.register(SearchPage.getInstance());
59 OptionsPage.register(BrowserOptions.getInstance()); 57 OptionsPage.register(BrowserOptions.getInstance());
60 58
61 // Overlays. 59 // Overlays.
62 OptionsPage.registerOverlay(AddLanguageOverlay.getInstance(), 60 OptionsPage.registerOverlay(AddLanguageOverlay.getInstance(),
63 LanguageOptions.getInstance()); 61 LanguageOptions.getInstance());
64 OptionsPage.registerOverlay(AlertOverlay.getInstance()); 62 OptionsPage.registerOverlay(AlertOverlay.getInstance());
65 OptionsPage.registerOverlay(AutofillEditAddressOverlay.getInstance(), 63 OptionsPage.registerOverlay(AutofillEditAddressOverlay.getInstance(),
66 AutofillOptions.getInstance()); 64 AutofillOptions.getInstance());
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 OptionsPage.registerOverlay(KeyboardOverlay.getInstance(), 130 OptionsPage.registerOverlay(KeyboardOverlay.getInstance(),
133 BrowserOptions.getInstance(), 131 BrowserOptions.getInstance(),
134 [$('keyboard-settings-button')]); 132 [$('keyboard-settings-button')]);
135 OptionsPage.registerOverlay(PointerOverlay.getInstance(), 133 OptionsPage.registerOverlay(PointerOverlay.getInstance(),
136 BrowserOptions.getInstance(), 134 BrowserOptions.getInstance(),
137 [$('pointer-settings-button')]); 135 [$('pointer-settings-button')]);
138 OptionsPage.registerOverlay(PreferredNetworks.getInstance(), 136 OptionsPage.registerOverlay(PreferredNetworks.getInstance(),
139 BrowserOptions.getInstance()); 137 BrowserOptions.getInstance());
140 OptionsPage.registerOverlay( 138 OptionsPage.registerOverlay(
141 new OptionsPage('languageChewing', 139 new OptionsPage('languageChewing',
142 templateData.languageChewingPageTabTitle, 140 loadTimeData.getString('languageChewingPageTabTitle'),
143 'languageChewingPage'), 141 'languageChewingPage'),
144 LanguageOptions.getInstance()); 142 LanguageOptions.getInstance());
145 OptionsPage.registerOverlay( 143 OptionsPage.registerOverlay(
146 new OptionsPage('languageHangul', 144 new OptionsPage('languageHangul',
147 templateData.languageHangulPageTabTitle, 145 loadTimeData.getString('languageHangulPageTabTitle'),
148 'languageHangulPage'), 146 'languageHangulPage'),
149 LanguageOptions.getInstance()); 147 LanguageOptions.getInstance());
150 OptionsPage.registerOverlay( 148 OptionsPage.registerOverlay(
151 new OptionsPage('languageMozc', 149 new OptionsPage('languageMozc',
152 templateData.languageMozcPageTabTitle, 150 loadTimeData.getString('languageMozcPageTabTitle'),
153 'languageMozcPage'), 151 'languageMozcPage'),
154 LanguageOptions.getInstance()); 152 LanguageOptions.getInstance());
155 OptionsPage.registerOverlay( 153 OptionsPage.registerOverlay(
156 new OptionsPage('languagePinyin', 154 new OptionsPage('languagePinyin',
157 templateData.languagePinyinPageTabTitle, 155 loadTimeData.getString('languagePinyinPageTabTitle'),
158 'languagePinyinPage'), 156 'languagePinyinPage'),
159 LanguageOptions.getInstance()); 157 LanguageOptions.getInstance());
160 // Only use the VirtualKeyboardManager if the keyboard DOM elements (which 158 // Only use the VirtualKeyboardManager if the keyboard DOM elements (which
161 // it will assume exists) are present (i.e. if we were built with 159 // it will assume exists) are present (i.e. if we were built with
162 // use_virtual_keyboard=1). 160 // use_virtual_keyboard=1).
163 if ($('language-options-virtual-keyboard')) { 161 if ($('language-options-virtual-keyboard')) {
164 OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(), 162 OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(),
165 LanguageOptions.getInstance()); 163 LanguageOptions.getInstance());
166 } 164 }
167 } 165 }
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 options.OptionsPage.willClose(); 224 options.OptionsPage.willClose();
227 }; 225 };
228 226
229 /** 227 /**
230 * Listener for the |popstate| event. 228 * Listener for the |popstate| event.
231 * @param {Event} e The |popstate| event. 229 * @param {Event} e The |popstate| event.
232 */ 230 */
233 window.onpopstate = function(e) { 231 window.onpopstate = function(e) {
234 options.OptionsPage.setState(e.state); 232 options.OptionsPage.setState(e.state);
235 }; 233 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698