Add Now setting and migration logic.

chrome/browser/ui/webui/options/browser_options_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 259 matching lines @@
     { "extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED },
     { "extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE },
     { "fontSettingsCustomizeFontsButton",
       IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON },
     { "fontSizeLabelCustom", IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM },
     { "fontSizeLabelLarge", IDS_OPTIONS_FONT_SIZE_LABEL_LARGE },
     { "fontSizeLabelMedium", IDS_OPTIONS_FONT_SIZE_LABEL_MEDIUM },
     { "fontSizeLabelSmall", IDS_OPTIONS_FONT_SIZE_LABEL_SMALL },
     { "fontSizeLabelVeryLarge", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE },
     { "fontSizeLabelVerySmall", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL },
+    { "googleNowLauncherEnable", IDS_OPTIONS_ENABLE_GOOGLE_NOW },
     { "hideAdvancedSettings", IDS_SETTINGS_HIDE_ADVANCED_SETTINGS },
     { "homePageNtp", IDS_OPTIONS_HOMEPAGE_NTP },
     { "homePageShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
     { "homePageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB },
     { "homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL },
     { "hotwordAlwaysOnAudioHistoryDescription",
       IDS_HOTWORD_ALWAYS_ON_AUDIO_HISTORY_DESCRIPTION },
     { "hotwordAlwaysOnDesc", IDS_HOTWORD_SEARCH_ALWAYS_ON_DESCRIPTION },
     { "hotwordAudioHistoryManage", IDS_HOTWORD_AUDIO_HISTORY_MANAGE_LINK },
     { "hotwordAudioLoggingEnable", IDS_HOTWORD_AUDIO_LOGGING_ENABLE },
@@ skipping 480 matching lines @@
 
 #if defined(ENABLE_SERVICE_DISCOVERY)
   if (cloud_print_mdns_ui_enabled_) {
     web_ui()->RegisterMessageCallback(
         "showCloudPrintDevicesPage",
         base::Bind(&BrowserOptionsHandler::ShowCloudPrintDevicesPage,
                    base::Unretained(this)));
   }
 #endif
   web_ui()->RegisterMessageCallback(
+      "requestGoogleNowAvailable",
+      base::Bind(&BrowserOptionsHandler::HandleRequestGoogleNowAvailable,
+                 base::Unretained(this)));
+
+  web_ui()->RegisterMessageCallback(
       "requestHotwordAvailable",
       base::Bind(&BrowserOptionsHandler::HandleRequestHotwordAvailable,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
       "launchHotwordAudioVerificationApp",
       base::Bind(
           &BrowserOptionsHandler::HandleLaunchHotwordAudioVerificationApp,
           base::Unretained(this)));
 
@@ skipping 415 matching lines @@
       "BrowserOptions.updateSearchEngines",
       search_engines,
       base::FundamentalValue(default_index),
       base::FundamentalValue(
           template_url_service_->is_default_search_managed() ||
           template_url_service_->IsExtensionControlledDefaultSearch()));
 
   SetupExtensionControlledIndicators();
 
   HandleRequestHotwordAvailable(nullptr);
+  HandleRequestGoogleNowAvailable(nullptr);
 }
 
 void BrowserOptionsHandler::SetDefaultSearchEngine(
     const base::ListValue* args) {
   int selected_index = -1;
   if (!ExtractIntegerValue(args, &selected_index)) {
     NOTREACHED();
     return;
   }
 
@@ skipping 453 matching lines @@
 void BrowserOptionsHandler::SetHotwordAudioHistorySectionVisible(
     const base::string16& audio_history_state,
     bool success, bool logging_enabled) {
   bool visible = logging_enabled && success;
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setAudioHistorySectionVisible",
       base::FundamentalValue(visible),
       base::StringValue(audio_history_state));
 }
 
+void BrowserOptionsHandler::HandleRequestGoogleNowAvailable(
+    const base::ListValue* args) {
+  bool is_search_provider_google = false;
+  if (template_url_service_ && template_url_service_->loaded()) {
+    const TemplateURL* default_url =
+        template_url_service_->GetDefaultSearchProvider();
+    if (default_url && default_url->HasGoogleBaseURLs(
+            template_url_service_->search_terms_data())) {
+      is_search_provider_google = true;
+    }
+  }
+
+  std::string group = base::FieldTrialList::FindFullName("GoogleNowLauncher");

[robliao, 2015/02/19 18:43:25]

Turn "GoogleNowLauncher" and "Disabled" into a const char [] (same as in
component_loader.cc)

[skare_, 2015/02/19 20:19:29]

VoiceTrigger (below) is using this format for its trial name and "Disabled." and
the file in general doesn't seem to use const char[]s.  I am ok switching if you
want though, let me know and reopen.

+  bool has_field_trial = (!group.empty() && group != "Disabled");
+
+  bool should_show = is_search_provider_google && has_field_trial;
+  web_ui()->CallJavascriptFunction(
+      "BrowserOptions.setNowSectionVisible",
+      base::FundamentalValue(should_show));
+}
+
 void BrowserOptionsHandler::HandleRequestHotwordAvailable(
     const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
 
   bool is_search_provider_google = false;
   // The check for default search provider is only valid if the
   // |template_url_service_| has loaded already.
   if (template_url_service_ && template_url_service_->loaded()) {
     const TemplateURL* default_url =
         template_url_service_->GetDefaultSearchProvider();
@@ skipping 422 matching lines @@
 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
                                             const policy::PolicyMap& previous,
                                             const policy::PolicyMap& current) {
   std::set<std::string> different_keys;
   current.GetDifferingKeys(previous, &different_keys);
   if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
     SetupMetricsReportingCheckbox();
 }
 
 }  // namespace options