alternate ntp: persist show-search-provider-logo option at chrome://instant

chrome/browser/ui/webui/instant_ui.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/instant_ui.h"
 
 #include "base/bind.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
@@ skipping 26 matching lines @@
   InstantUIMessageHandler();
   virtual ~InstantUIMessageHandler();
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
 
   static int slow_animation_scale_factor() {
     return slow_animation_scale_factor_;
   }
 
-  static bool show_search_provider_logo() {
-    return show_search_provider_logo_;
-  }
-
  private:
   void GetPreferenceValue(const base::ListValue* args);
   void SetPreferenceValue(const base::ListValue* args);
 
   // Slows down Instant animations by a time factor.
   static int slow_animation_scale_factor_;
 
-  // True if search provider logo should be shown.
-  static bool show_search_provider_logo_;
-
   DISALLOW_COPY_AND_ASSIGN(InstantUIMessageHandler);
 };
 
 // static
 int InstantUIMessageHandler::slow_animation_scale_factor_ = 1;
-bool InstantUIMessageHandler::show_search_provider_logo_ = false;
 
 InstantUIMessageHandler::InstantUIMessageHandler() {}
 
 InstantUIMessageHandler::~InstantUIMessageHandler() {}
 
 void InstantUIMessageHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "getPreferenceValue",
       base::Bind(&InstantUIMessageHandler::GetPreferenceValue,
                  base::Unretained(this)));
@@ skipping 10 matching lines @@
   base::StringValue pref_name_value(pref_name);
   if (pref_name == prefs::kInstantAnimationScaleFactor) {
     double value = 0.0;
 #if defined(TOOLKIT_VIEWS)
     value = slow_animation_scale_factor_;
 #endif
     base::FundamentalValue arg(value);
     web_ui()->CallJavascriptFunction(
         "instantConfig.getPreferenceValueResult", pref_name_value, arg);
   } else if (pref_name == prefs::kInstantShowSearchProviderLogo) {
-    base::FundamentalValue arg(show_search_provider_logo_);
+    PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
+    base::FundamentalValue arg(prefs->GetBoolean(pref_name.c_str()));
     web_ui()->CallJavascriptFunction(
         "instantConfig.getPreferenceValueResult", pref_name_value, arg);
   } else if (pref_name == prefs::kExperimentalZeroSuggestUrlPrefix) {
     PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
     base::StringValue arg(prefs->GetString(pref_name.c_str()));
     web_ui()->CallJavascriptFunction(
         "instantConfig.getPreferenceValueResult", pref_name_value, arg);
   }
 }
 
 void InstantUIMessageHandler::SetPreferenceValue(const base::ListValue* args) {
   std::string pref_name;
   if (!args->GetString(0, &pref_name)) return;
 
   if (pref_name == prefs::kInstantAnimationScaleFactor) {
     double value;
     if (!args->GetDouble(1, &value))
       return;
 #if defined(TOOLKIT_VIEWS)
     // Clamp to something reasonable.
     value = std::max(0.1, std::min(value, 20.0));
     slow_animation_scale_factor_ = static_cast<int>(value);
 #else
     NOTIMPLEMENTED();
 #endif  // defined(TOOLKIT_VIEWS)
   } else if (pref_name == prefs::kInstantShowSearchProviderLogo) {
     bool value;
     if (!args->GetBoolean(1, &value))
       return;
-    show_search_provider_logo_ = value;
+    PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
+    prefs->SetBoolean(pref_name.c_str(), value);
   } else if (pref_name == prefs::kExperimentalZeroSuggestUrlPrefix) {
     std::string value;
     if (!args->GetString(1, &value))
       return;
     PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
     prefs->SetString(pref_name.c_str(), value);
   }
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // InstantUI
 
 InstantUI::InstantUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new InstantUIMessageHandler());
 
   // Set up the chrome://instant/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, CreateInstantHTMLSource());
 }
 
 // static
 int InstantUI::GetSlowAnimationScaleFactor() {
   return InstantUIMessageHandler::slow_animation_scale_factor();
 }
 
 // static
-bool InstantUI::ShouldShowSearchProviderLogo() {
-  return InstantUIMessageHandler::show_search_provider_logo();
+bool InstantUI::ShouldShowSearchProviderLogo(
+      content::BrowserContext* browser_context) {
+  PrefService* prefs = Profile::FromBrowserContext(browser_context)->GetPrefs();
+  return prefs->GetBoolean(prefs::kInstantShowSearchProviderLogo);
 }
+
+// static
+void InstantUI::RegisterUserPrefs(PrefService* user_prefs) {
+  user_prefs->RegisterBooleanPref(prefs::kInstantShowSearchProviderLogo, false,
+                                  PrefService::UNSYNCABLE_PREF);
+  user_prefs->RegisterStringPref(prefs::kExperimentalZeroSuggestUrlPrefix, "",
+                                 PrefService::UNSYNCABLE_PREF);
+}