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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options.html

Issue 5145003: Fix a bug that caused proxy settings and language settings to be gone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove labs Created 10 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 <html 2 <html
3 i18n-values="dir:textdirection; 3 i18n-values="dir:textdirection;
4 enable-background-mode:enable-background-mode; 4 enable-background-mode:enable-background-mode;
5 enable-cloud-print-proxy:enable-cloud-print-proxy" 5 enable-cloud-print-proxy:enable-cloud-print-proxy"
6 id="t"> 6 id="t">
7 <head> 7 <head>
8 <meta charset="utf-8"> 8 <meta charset="utf-8">
9 <title i18n-content="title"></title> 9 <title i18n-content="title"></title>
10 10
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 OptionsPage.registerOverlay(AlertOverlay.getInstance()); 219 OptionsPage.registerOverlay(AlertOverlay.getInstance());
220 OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance()); 220 OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance());
221 OptionsPage.registerOverlay(AutoFillEditCreditCardOverlay.getInstance()); 221 OptionsPage.registerOverlay(AutoFillEditCreditCardOverlay.getInstance());
222 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance()); 222 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance());
223 OptionsPage.registerOverlay(EditSearchEngineOverlay.getInstance()); 223 OptionsPage.registerOverlay(EditSearchEngineOverlay.getInstance());
224 OptionsPage.registerOverlay(ImportDataOverlay.getInstance()); 224 OptionsPage.registerOverlay(ImportDataOverlay.getInstance());
225 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance()); 225 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance());
226 226
227 if (cr.isChromeOS) { 227 if (cr.isChromeOS) {
228 OptionsPage.register(AccountsOptions.getInstance()); 228 OptionsPage.register(AccountsOptions.getInstance());
229 OptionsPage.registerSubPage(LanguageOptions.getInstance()); 229 OptionsPage.registerSubPage(ProxyOptions.getInstance(),
230 OptionsPage.registerSubPage(new OptionsPage( 230 InternetOptions.getInstance());
231 'languageChewing',
232 localStrings.getString('languageChewingPage'),
233 'languageChewingPage'));
234 OptionsPage.registerSubPage(new OptionsPage(
235 'languageHangul',
236 localStrings.getString('languageHangulPage'),
237 'languageHangulPage'));
238 OptionsPage.registerSubPage(new OptionsPage(
239 'languageMozc',
240 localStrings.getString('languageMozcPage'),
241 'languageMozcPage'));
242 OptionsPage.registerSubPage(new OptionsPage(
243 'languagePinyin',
244 localStrings.getString('languagePinyinPage'),
245 'languagePinyinPage'));
246 OptionsPage.registerSubPage(ProxyOptions.getInstance());
247 OptionsPage.registerOverlay(new OptionsPage( 231 OptionsPage.registerOverlay(new OptionsPage(
248 'detailsInternetPage', 232 'detailsInternetPage',
249 'detailsInternetPage', 233 'detailsInternetPage',
250 'detailsInternetPage')); 234 'detailsInternetPage'));
251 } 235 }
252 236
253 var languageModifierKeysOverlay = new OptionsPage( 237 var languageModifierKeysOverlay = new OptionsPage(
254 'languageCustomizeModifierKeysOverlay', 238 'languageCustomizeModifierKeysOverlay',
255 localStrings.getString('languageCustomizeModifierKeysOverlay'), 239 localStrings.getString('languageCustomizeModifierKeysOverlay'),
256 'languageCustomizeModifierKeysOverlay') 240 'languageCustomizeModifierKeysOverlay')
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 <div id="mainview"> 320 <div id="mainview">
337 <div class="hidden" id="managed-prefs-banner"> 321 <div class="hidden" id="managed-prefs-banner">
338 <span id="managed-prefs-icon"></span> 322 <span id="managed-prefs-icon"></span>
339 <span id="managed-prefs-text" 323 <span id="managed-prefs-text"
340 i18n-content="managedPrefsBannerText"></span> 324 i18n-content="managedPrefsBannerText"></span>
341 </div> 325 </div>
342 <div id="mainview-content"> 326 <div id="mainview-content">
343 <if expr="pp_ifdef('chromeos')"> 327 <if expr="pp_ifdef('chromeos')">
344 <include src="options/chromeos_system_options.html"> 328 <include src="options/chromeos_system_options.html">
345 <include src="options/chromeos_internet_options.html"> 329 <include src="options/chromeos_internet_options.html">
346 <include src="options/chromeos_language_options.html">
347 <include src="options/chromeos_language_chewing_options.html">
348 <include src="options/chromeos_language_hangul_options.html">
349 <include src="options/chromeos_language_mozc_options.html">
350 <include src="options/chromeos_language_pinyin_options.html">
351 <include src="options/chromeos_accounts_options.html"> 330 <include src="options/chromeos_accounts_options.html">
352 </if> 331 </if>
353 <include src="options/advanced_options.html"> 332 <include src="options/advanced_options.html">
354 <include src="options/browser_options.html"> 333 <include src="options/browser_options.html">
355 <include src="options/personal_options.html"> 334 <include src="options/personal_options.html">
356 <div id="subpage-sheet-container" class="hidden"> 335 <div id="subpage-sheet-container" class="hidden">
357 <div id="subpage-sheet"> 336 <div id="subpage-sheet">
358 <if expr="pp_ifdef('chromeos')"> 337 <if expr="pp_ifdef('chromeos')">
359 <include src="options/about_page.html"> 338 <include src="options/about_page.html">
360 <include src="options/chromeos_language_options.html"> 339 <include src="options/chromeos_language_options.html">
(...skipping 29 matching lines...) Expand all
390 cr.ui.decorate('input[pref][type=text]', options.PrefTextField); 369 cr.ui.decorate('input[pref][type=text]', options.PrefTextField);
391 cr.ui.decorate('input[pref][type=url]', options.PrefTextField); 370 cr.ui.decorate('input[pref][type=url]', options.PrefTextField);
392 cr.ui.decorate('#contentSettingsPage input[type=radio]', 371 cr.ui.decorate('#contentSettingsPage input[type=radio]',
393 options.ContentSettingsRadio); 372 options.ContentSettingsRadio);
394 cr.ui.decorate('#fontSettingsMinimumSizeSelector', 373 cr.ui.decorate('#fontSettingsMinimumSizeSelector',
395 options.MinimumFontSizeSelect); 374 options.MinimumFontSizeSelect);
396 console.log('in bottom script'); 375 console.log('in bottom script');
397 </script> 376 </script>
398 </body> 377 </body>
399 </html> 378 </html>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698