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

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

Issue 136693013: [Hotword] Remove unneeded preferences. Cleaning up look of settings. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: wrong section name in test Created 6 years, 10 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 BrowserOptions = options.BrowserOptions; 10 var BrowserOptions = options.BrowserOptions;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 new ConfirmDialog( 97 new ConfirmDialog(
98 'spellingConfirm', 98 'spellingConfirm',
99 loadTimeData.getString('spellingConfirmOverlayTabTitle'), 99 loadTimeData.getString('spellingConfirmOverlayTabTitle'),
100 'spelling-confirm-overlay', 100 'spelling-confirm-overlay',
101 $('spelling-confirm-ok'), 101 $('spelling-confirm-ok'),
102 $('spelling-confirm-cancel'), 102 $('spelling-confirm-cancel'),
103 $('spelling-enabled-control').pref, 103 $('spelling-enabled-control').pref,
104 $('spelling-enabled-control').metric), 104 $('spelling-enabled-control').metric),
105 BrowserOptions.getInstance()); 105 BrowserOptions.getInstance());
106 } 106 }
107 OptionsPage.registerOverlay(
108 new ConfirmDialog(
109 'hotwordConfirm',
110 loadTimeData.getString('hotwordConfirmOverlayTabTitle'),
111 'hotword-confirm-overlay',
112 $('hotword-confirm-ok'),
113 $('hotword-confirm-cancel'),
114 $('hotword-search-enable').pref,
115 $('hotword-search-enable').metric),
116 BrowserOptions.getInstance());
107 OptionsPage.registerOverlay(ContentSettings.getInstance(), 117 OptionsPage.registerOverlay(ContentSettings.getInstance(),
108 BrowserOptions.getInstance(), 118 BrowserOptions.getInstance(),
109 [$('privacyContentSettingsButton')]); 119 [$('privacyContentSettingsButton')]);
110 OptionsPage.registerOverlay(ContentSettingsExceptionsArea.getInstance(), 120 OptionsPage.registerOverlay(ContentSettingsExceptionsArea.getInstance(),
111 ContentSettings.getInstance()); 121 ContentSettings.getInstance());
112 OptionsPage.registerOverlay(CookiesView.getInstance(), 122 OptionsPage.registerOverlay(CookiesView.getInstance(),
113 ContentSettings.getInstance(), 123 ContentSettings.getInstance(),
114 [$('privacyContentSettingsButton'), 124 [$('privacyContentSettingsButton'),
115 $('show-cookies-button')]); 125 $('show-cookies-button')]);
116 OptionsPage.registerOverlay(CreateProfileOverlay.getInstance(), 126 OptionsPage.registerOverlay(CreateProfileOverlay.getInstance(),
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 options.OptionsPage.willClose(); 260 options.OptionsPage.willClose();
251 }; 261 };
252 262
253 /** 263 /**
254 * Listener for the |popstate| event. 264 * Listener for the |popstate| event.
255 * @param {Event} e The |popstate| event. 265 * @param {Event} e The |popstate| event.
256 */ 266 */
257 window.onpopstate = function(e) { 267 window.onpopstate = function(e) {
258 options.OptionsPage.setState(e.state); 268 options.OptionsPage.setState(e.state);
259 }; 269 };
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/browser/search/hotword_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698