chrome/browser/resources/options.html - Issue 3152037: Fixing merge regression.

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

Issue 3152037: Fixing merge regression. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 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:

« no previous file with comments | « no previous file | no next file » | no next file with comments »

OLD	NEW
1 <!DOCTYPE HTML>	1 <!DOCTYPE HTML>

2 <html i18n-values="dir:textdirection;" id="t">	2 <html i18n-values="dir:textdirection;" id="t">

3 <head>	3 <head>

4 <meta charset="utf-8">	4 <meta charset="utf-8">

5 <title i18n-content="title"></title>	5 <title i18n-content="title"></title>

6	6

7 <!-- TODO(zelidrag) need a better icon here -->	7 <!-- TODO(zelidrag) need a better icon here -->

8 <link rel="icon" href="../../app/theme/history_favicon.png">	8 <link rel="icon" href="../../app/theme/history_favicon.png">

9	9

10 <script src="chrome://resources/js/class_list.js"></script>	10 <script src="chrome://resources/js/class_list.js"></script>

(...skipping 77 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
88	88

89 if (cr.isChromeOS) {	89 if (cr.isChromeOS) {

90 OptionsPage.registerSubPage(AboutPage.getInstance());	90 OptionsPage.registerSubPage(AboutPage.getInstance());

91 OptionsPage.register(SystemOptions.getInstance());	91 OptionsPage.register(SystemOptions.getInstance());

92 OptionsPage.register(InternetOptions.getInstance());	92 OptionsPage.register(InternetOptions.getInstance());

93 }	93 }

94	94

95 OptionsPage.register(BrowserOptions.getInstance());	95 OptionsPage.register(BrowserOptions.getInstance());

96 OptionsPage.register(PersonalOptions.getInstance());	96 OptionsPage.register(PersonalOptions.getInstance());

97 OptionsPage.register(AdvancedOptions.getInstance());	97 OptionsPage.register(AdvancedOptions.getInstance());

98 OptionsPage.registerSubPage(AboutPage.getInstance());

99 OptionsPage.registerSubPage(AutoFillOptions.getInstance());	98 OptionsPage.registerSubPage(AutoFillOptions.getInstance());

100 OptionsPage.registerSubPage(ContentSettings.getInstance());	99 OptionsPage.registerSubPage(ContentSettings.getInstance());

101 OptionsPage.registerSubPage(PasswordsExceptions.getInstance());	100 OptionsPage.registerSubPage(PasswordsExceptions.getInstance());

102 OptionsPage.registerSubPage(SearchEngineManager.getInstance());	101 OptionsPage.registerSubPage(SearchEngineManager.getInstance());

103 OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance());	102 OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance());

104 OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance());	103 OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance());

105 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance());	104 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance());

106 OptionsPage.registerOverlay(FontSettingsOverlay.getInstance());	105 OptionsPage.registerOverlay(FontSettingsOverlay.getInstance());

107 OptionsPage.registerOverlay(ImportDataOverlay.getInstance());	106 OptionsPage.registerOverlay(ImportDataOverlay.getInstance());

108 OptionsPage.registerOverlay(StopSyncingOverlay.getInstance());	107 OptionsPage.registerOverlay(StopSyncingOverlay.getInstance());

(...skipping 143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
252 cr.ui.decorate('input[pref][type=number]', options.PrefNumber);	251 cr.ui.decorate('input[pref][type=number]', options.PrefNumber);

253 cr.ui.decorate('input[pref][type=radio]', options.PrefRadio);	252 cr.ui.decorate('input[pref][type=radio]', options.PrefRadio);

254 cr.ui.decorate('input[pref][type=range]', options.PrefRange);	253 cr.ui.decorate('input[pref][type=range]', options.PrefRange);

255 cr.ui.decorate('select[pref]', options.PrefSelect);	254 cr.ui.decorate('select[pref]', options.PrefSelect);

256 cr.ui.decorate('input[pref][type=url]', options.PrefTextField);	255 cr.ui.decorate('input[pref][type=url]', options.PrefTextField);

257 cr.ui.decorate('#contentSettingsPage input[type=radio]',	256 cr.ui.decorate('#contentSettingsPage input[type=radio]',

258 options.ContentSettingsRadio);	257 options.ContentSettingsRadio);

259 </script>	258 </script>

260 </body>	259 </body>

261 </html>	260 </html>

OLD	NEW