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

Unified Diff: chrome/browser/resources/options/browser_options.js

Issue 938713004: Add Now setting and migration logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options/browser_options.js
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index c47916b4414549bcb3da6550b5e46b1c5ac0ce76..71a3e71db4c5285ea34a0eddbf97cf97411a59df 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -246,6 +246,8 @@ cr.define('options', function() {
$('hotword-always-on-search-checkbox');
chrome.send('requestHotwordAvailable');
+ chrome.send('requestGoogleNowAvailable');
+
if ($('set-wallpaper')) {
$('set-wallpaper').onclick = function(event) {
chrome.send('openWallpaperManager');
@@ -1250,6 +1252,15 @@ cr.define('options', function() {
},
/**
+ * Controls the visibility of all the hotword sections.
robliao 2015/02/19 18:43:25 hotword -> Google Now section. Here and below.
skare_ 2015/02/19 20:19:29 Done.
+ * @param {boolean} visible Whether to show hotword sections.
+ * @private
+ */
+ setNowSectionVisible_: function(visible) {
+ $('google-now-launcher').hidden = !visible;
+ },
+
+ /**
* Activates the Audio History section of the Settings page.
* @param {boolean} visible Whether the audio history section is visible.
* @param {string} labelText Text describing current audio history state.
@@ -2169,6 +2180,7 @@ cr.define('options', function() {
'setHotwordRetrainLinkVisible',
'setNativeThemeButtonEnabled',
'setNetworkPredictionValue',
+ 'setNowSectionVisible',
'setHighContrastCheckboxState',
'setAllHotwordSectionsVisible',
'setMetricsReportingCheckboxState',

Powered by Google App Engine
This is Rietveld 408576698