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

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

Issue 2617823002: GRIT: put <if> and <include> behind comments in .js files to make syntactically valid JS (Closed)
Patch Set: add dep Created 3 years, 11 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
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 AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner; 10 var AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner;
11 var BrowserOptions = options.BrowserOptions; 11 var BrowserOptions = options.BrowserOptions;
12 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay; 12 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay;
13 var ClearBrowserDataHistoryNotice = options.ClearBrowserDataHistoryNotice; 13 var ClearBrowserDataHistoryNotice = options.ClearBrowserDataHistoryNotice;
14 var ConfirmDialog = options.ConfirmDialog; 14 var ConfirmDialog = options.ConfirmDialog;
15 var ContentSettingsExceptionsArea = 15 var ContentSettingsExceptionsArea =
16 options.contentSettings.ContentSettingsExceptionsArea; 16 options.contentSettings.ContentSettingsExceptionsArea;
17 var ContentSettings = options.ContentSettings; 17 var ContentSettings = options.ContentSettings;
18 var CookiesView = options.CookiesView; 18 var CookiesView = options.CookiesView;
19 var CreateProfileOverlay = options.CreateProfileOverlay; 19 var CreateProfileOverlay = options.CreateProfileOverlay;
20 var EditDictionaryOverlay = cr.IsMac ? null : options.EditDictionaryOverlay; 20 var EditDictionaryOverlay = cr.IsMac ? null : options.EditDictionaryOverlay;
21 var EasyUnlockTurnOffOverlay = options.EasyUnlockTurnOffOverlay; 21 var EasyUnlockTurnOffOverlay = options.EasyUnlockTurnOffOverlay;
22 var FactoryResetOverlay = options.FactoryResetOverlay; 22 var FactoryResetOverlay = options.FactoryResetOverlay;
23 <if expr="enable_google_now"> 23 // <if expr="enable_google_now">
24 var GeolocationOptions = options.GeolocationOptions; 24 var GeolocationOptions = options.GeolocationOptions;
25 </if> 25 // </if>
26 var FontSettings = options.FontSettings; 26 var FontSettings = options.FontSettings;
27 var HandlerOptions = options.HandlerOptions; 27 var HandlerOptions = options.HandlerOptions;
28 var HomePageOverlay = options.HomePageOverlay; 28 var HomePageOverlay = options.HomePageOverlay;
29 var HotwordConfirmDialog = options.HotwordConfirmDialog; 29 var HotwordConfirmDialog = options.HotwordConfirmDialog;
30 var ImportDataOverlay = options.ImportDataOverlay; 30 var ImportDataOverlay = options.ImportDataOverlay;
31 var LanguageOptions = options.LanguageOptions; 31 var LanguageOptions = options.LanguageOptions;
32 var ManageProfileOverlay = options.ManageProfileOverlay; 32 var ManageProfileOverlay = options.ManageProfileOverlay;
33 var DisconnectAccountOverlay = options.DisconnectAccountOverlay; 33 var DisconnectAccountOverlay = options.DisconnectAccountOverlay;
34 var OptionsFocusManager = options.OptionsFocusManager; 34 var OptionsFocusManager = options.OptionsFocusManager;
35 var OptionsPage = options.OptionsPage; 35 var OptionsPage = options.OptionsPage;
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 [$('reset-profile-settings')]); 169 [$('reset-profile-settings')]);
170 PageManager.registerOverlay(SearchEngineManager.getInstance(), 170 PageManager.registerOverlay(SearchEngineManager.getInstance(),
171 BrowserOptions.getInstance(), 171 BrowserOptions.getInstance(),
172 [$('manage-default-search-engines')]); 172 [$('manage-default-search-engines')]);
173 PageManager.registerOverlay(StartupOverlay.getInstance(), 173 PageManager.registerOverlay(StartupOverlay.getInstance(),
174 BrowserOptions.getInstance()); 174 BrowserOptions.getInstance());
175 PageManager.registerOverlay(SyncSetupOverlay.getInstance(), 175 PageManager.registerOverlay(SyncSetupOverlay.getInstance(),
176 BrowserOptions.getInstance(), 176 BrowserOptions.getInstance(),
177 [$('customize-sync')]); 177 [$('customize-sync')]);
178 178
179 <if expr="is_win"> 179 // <if expr="is_win">
180 PageManager.registerOverlay( 180 PageManager.registerOverlay(
181 new ResetProfileSettingsOverlay(true /* isTriggered */), 181 new ResetProfileSettingsOverlay(true /* isTriggered */),
182 BrowserOptions.getInstance()); 182 BrowserOptions.getInstance());
183 </if> 183 // </if>
184 184
185 if (loadTimeData.getBoolean('showAbout')) { 185 if (loadTimeData.getBoolean('showAbout')) {
186 PageManager.registerOverlay(help.HelpPage.getInstance(), 186 PageManager.registerOverlay(help.HelpPage.getInstance(),
187 BrowserOptions.getInstance()); 187 BrowserOptions.getInstance());
188 if (help.ChannelChangePage) { 188 if (help.ChannelChangePage) {
189 PageManager.registerOverlay(help.ChannelChangePage.getInstance(), 189 PageManager.registerOverlay(help.ChannelChangePage.getInstance(),
190 help.HelpPage.getInstance()); 190 help.HelpPage.getInstance());
191 } 191 }
192 } 192 }
193 if (cr.isChromeOS) { 193 if (cr.isChromeOS) {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 }; 304 };
305 305
306 /** 306 /**
307 * Listener for the |popstate| event. 307 * Listener for the |popstate| event.
308 * @param {Event} e The |popstate| event. 308 * @param {Event} e The |popstate| event.
309 */ 309 */
310 window.onpopstate = function(e) { 310 window.onpopstate = function(e) {
311 var pageName = PageManager.getPageNameFromPath(); 311 var pageName = PageManager.getPageNameFromPath();
312 PageManager.setState(pageName, location.hash, e.state); 312 PageManager.setState(pageName, location.hash, e.state);
313 }; 313 };
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/browser_options.js ('k') | chrome/browser/resources/options/options_bundle.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698