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

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

Issue 463823002: Settings page: Do not grey out the "Ok Google" checkbox on errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/options/hotword_confirm_dialog.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cr.define('options', function() { 5 cr.define('options', function() {
6 var OptionsPage = options.OptionsPage; 6 var OptionsPage = options.OptionsPage;
7 var Page = cr.ui.pageManager.Page; 7 var Page = cr.ui.pageManager.Page;
8 var PageManager = cr.ui.pageManager.PageManager; 8 var PageManager = cr.ui.pageManager.PageManager;
9 var ArrayDataModel = cr.ui.ArrayDataModel; 9 var ArrayDataModel = cr.ui.ArrayDataModel;
10 var RepeatingButton = cr.ui.RepeatingButton; 10 var RepeatingButton = cr.ui.RepeatingButton;
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 this.onHomePageIsNtpChanged_.bind(this)); 194 this.onHomePageIsNtpChanged_.bind(this));
195 195
196 $('change-home-page').onclick = function(event) { 196 $('change-home-page').onclick = function(event) {
197 PageManager.showPageByName('homePageOverlay'); 197 PageManager.showPageByName('homePageOverlay');
198 chrome.send('coreOptionsUserMetricsAction', 198 chrome.send('coreOptionsUserMetricsAction',
199 ['Options_Homepage_ShowSettings']); 199 ['Options_Homepage_ShowSettings']);
200 }; 200 };
201 201
202 var hotwordIndicator = $('hotword-search-setting-indicator'); 202 var hotwordIndicator = $('hotword-search-setting-indicator');
203 HotwordSearchSettingIndicator.decorate(hotwordIndicator); 203 HotwordSearchSettingIndicator.decorate(hotwordIndicator);
204 hotwordIndicator.disabledOnErrorSection = $('hotword-search-enable');
205 chrome.send('requestHotwordAvailable'); 204 chrome.send('requestHotwordAvailable');
206 205
207 if ($('set-wallpaper')) { 206 if ($('set-wallpaper')) {
208 $('set-wallpaper').onclick = function(event) { 207 $('set-wallpaper').onclick = function(event) {
209 chrome.send('openWallpaperManager'); 208 chrome.send('openWallpaperManager');
210 chrome.send('coreOptionsUserMetricsAction', 209 chrome.send('coreOptionsUserMetricsAction',
211 ['Options_OpenWallpaperManager']); 210 ['Options_OpenWallpaperManager']);
212 }; 211 };
213 } 212 }
214 213
(...skipping 1741 matching lines...) Expand 10 before | Expand all | Expand 10 after
1956 BrowserOptions.getLoggedInUsername = function() { 1955 BrowserOptions.getLoggedInUsername = function() {
1957 return BrowserOptions.getInstance().username_; 1956 return BrowserOptions.getInstance().username_;
1958 }; 1957 };
1959 } 1958 }
1960 1959
1961 // Export 1960 // Export
1962 return { 1961 return {
1963 BrowserOptions: BrowserOptions 1962 BrowserOptions: BrowserOptions
1964 }; 1963 };
1965 }); 1964 });
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/options/hotword_confirm_dialog.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698