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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 3069008: remove the chromeos include and reland (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:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/dom_ui/personal_options_handler.cc ('k') | chrome/browser/resources/options/personal_options.html » ('j') | 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 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 20 matching lines...) Expand all
31 <script src="options/chromeos_accounts_user_name_edit.js"></script> 31 <script src="options/chromeos_accounts_user_name_edit.js"></script>
32 </if> 32 </if>
33 <script src="options/add_startup_page_overlay.js"></script> 33 <script src="options/add_startup_page_overlay.js"></script>
34 <script src="options/advanced_options.js"></script> 34 <script src="options/advanced_options.js"></script>
35 <script src="options/browser_options.js"></script> 35 <script src="options/browser_options.js"></script>
36 <script src="options/clear_browser_data_overlay.js"></script> 36 <script src="options/clear_browser_data_overlay.js"></script>
37 <script src="options/content_settings.js"></script> 37 <script src="options/content_settings.js"></script>
38 <script src="options/content_settings_exceptions_area.js"></script> 38 <script src="options/content_settings_exceptions_area.js"></script>
39 <script src="options/content_settings_ui.js"></script> 39 <script src="options/content_settings_ui.js"></script>
40 <script src="options/font_settings_overlay.js"></script> 40 <script src="options/font_settings_overlay.js"></script>
41 <script src="options/import_data_overlay.js"></script>
41 <script src="options/personal_options.js"></script> 42 <script src="options/personal_options.js"></script>
42 <script src="options/search_engine_manager.js"></script> 43 <script src="options/search_engine_manager.js"></script>
44 <script src="options/stop_syncing_overlay.js"></script>
43 <script> 45 <script>
44 46
45 /////////////////////////////////////////////////////////////////////////////// 47 ///////////////////////////////////////////////////////////////////////////////
46 // Document Functions: 48 // Document Functions:
47 /** 49 /**
48 * Window onload handler, sets up the page. 50 * Window onload handler, sets up the page.
49 */ 51 */
50 function load() { 52 function load() {
51 localStrings = new LocalStrings(); 53 localStrings = new LocalStrings();
52 54
(...skipping 12 matching lines...) Expand all
65 // OptionsPage.register(new OptionsPage( 67 // OptionsPage.register(new OptionsPage(
66 // 'languageMozc', 68 // 'languageMozc',
67 // localStrings.getString('languageMozcPage'), 69 // localStrings.getString('languageMozcPage'),
68 // 'languageMozcPage')); 70 // 'languageMozcPage'));
69 // OptionsPage.register(new OptionsPage( 71 // OptionsPage.register(new OptionsPage(
70 // 'languagePinyin', 72 // 'languagePinyin',
71 // localStrings.getString('languagePinyinPage'), 73 // localStrings.getString('languagePinyinPage'),
72 // 'languagePinyinPage')); 74 // 'languagePinyinPage'));
73 } 75 }
74 76
77 OptionsPage.register(AdvancedOptions.getInstance());
75 OptionsPage.register(BrowserOptions.getInstance()); 78 OptionsPage.register(BrowserOptions.getInstance());
76 OptionsPage.register(PersonalOptions.getInstance()); 79 OptionsPage.register(PersonalOptions.getInstance());
77 OptionsPage.register(AdvancedOptions.getInstance());
78 OptionsPage.registerSubPage(ContentSettings.getInstance()); 80 OptionsPage.registerSubPage(ContentSettings.getInstance());
79 OptionsPage.registerSubPage(SearchEngineManager.getInstance()); 81 OptionsPage.registerSubPage(SearchEngineManager.getInstance());
80 OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance()); 82 OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance());
81 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance()); 83 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance());
82 OptionsPage.registerOverlay(FontSettingsOverlay.getInstance()); 84 OptionsPage.registerOverlay(FontSettingsOverlay.getInstance());
85 OptionsPage.registerOverlay(ImportDataOverlay.getInstance());
86 OptionsPage.registerOverlay(StopSyncingOverlay.getInstance());
83 87
84 if (cr.isChromeOS) { 88 if (cr.isChromeOS) {
85 OptionsPage.register(AccountsOptions.getInstance()); 89 OptionsPage.register(AccountsOptions.getInstance());
86 var labsOptions = new OptionsPage('labs', 90 var labsOptions = new OptionsPage('labs',
87 localStrings.getString('labsPage'), 91 localStrings.getString('labsPage'),
88 'labsPage'); 92 'labsPage');
89 OptionsPage.register(labsOptions); 93 OptionsPage.register(labsOptions);
90 OptionsPage.registerSubPage(LanguageOptions.getInstance()); 94 OptionsPage.registerSubPage(LanguageOptions.getInstance());
91 } 95 }
92 96
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 <link rel="stylesheet" href="options/personal_options.css"> 132 <link rel="stylesheet" href="options/personal_options.css">
129 </head> 133 </head>
130 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 134 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
131 <div class="header"> 135 <div class="header">
132 </div> 136 </div>
133 <div id="overlay" class="overlay hidden"> 137 <div id="overlay" class="overlay hidden">
134 <div id="overlayview"> 138 <div id="overlayview">
135 <include src="options/add_startup_page_overlay.html"> 139 <include src="options/add_startup_page_overlay.html">
136 <include src="options/clear_browser_data_overlay.html"> 140 <include src="options/clear_browser_data_overlay.html">
137 <include src="options/font_settings_overlay.html"> 141 <include src="options/font_settings_overlay.html">
142 <include src="options/import_data_overlay.html">
143 <include src="options/stop_syncing_overlay.html">
138 </div> 144 </div>
139 </div> 145 </div>
140 <div id="main-content"> 146 <div id="main-content">
141 <div id="navbar-container"> 147 <div id="navbar-container">
142 <h1 id="settings-title" i18n-content="title"></h1> 148 <h1 id="settings-title" i18n-content="title"></h1>
143 <ul id="navbar"> 149 <ul id="navbar">
144 </ul> 150 </ul>
145 <hr/> 151 <hr/>
146 <ul id="subpagesnav"> 152 <ul id="subpagesnav">
147 </ul> 153 </ul>
(...skipping 28 matching lines...) Expand all
176 cr.ui.decorate('input[pref][type=number]', PrefNumber); 182 cr.ui.decorate('input[pref][type=number]', PrefNumber);
177 cr.ui.decorate('input[pref][type=radio]', PrefRadio); 183 cr.ui.decorate('input[pref][type=radio]', PrefRadio);
178 cr.ui.decorate('input[pref][type=range]', PrefRange); 184 cr.ui.decorate('input[pref][type=range]', PrefRange);
179 cr.ui.decorate('select[pref]', PrefSelect); 185 cr.ui.decorate('select[pref]', PrefSelect);
180 cr.ui.decorate('input[pref][type=url]', PrefTextField); 186 cr.ui.decorate('input[pref][type=url]', PrefTextField);
181 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio); 187 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio);
182 // TODO(zelidrag) add other elements here when we implement them 188 // TODO(zelidrag) add other elements here when we implement them
183 </script> 189 </script>
184 </body> 190 </body>
185 </html> 191 </html>
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/personal_options_handler.cc ('k') | chrome/browser/resources/options/personal_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698