Add ability to change default pref values, and use in BrowserInstantController.

chrome/browser/ui/browser_instant_controller.cc

 // Copyright 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/browser_instant_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/prefs/pref_registry_syncable.h"
@@ skipping 29 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserInstantController, public:
 
 BrowserInstantController::BrowserInstantController(Browser* browser)
     : browser_(browser),
       instant_(ALLOW_THIS_IN_INITIALIZER_LIST(this),
                chrome::search::IsInstantExtendedAPIEnabled(profile())),
       instant_unload_handler_(browser),
       initialized_theme_info_(false) {
-  profile_pref_registrar_.Init(profile()->GetPrefs());
+  PrefService* prefs = profile()->GetPrefs();
+
+  // The kInstantExtendedEnabled and kInstantEnabled preferences are
+  // separate, as the way opt-in is done is a bit different, and
+  // because the experiment that controls the behavior of
+  // kInstantExtendedEnabled (value retrieved via
+  // search::GetInstantExtendedDefaultSetting) may take different
+  // settings on different Chrome set-ups for the same user.
+  //
+  // In one mode of the experiment, however, the
+  // kInstantExtendedEnabled preference's default value is set to the
+  // existing value of kInstantEnabled.
+  //
+  // Because this requires reading the value of the kInstantEnabled
+  // value, we reset the default for kInstantExtendedEnabled here,
+  // instead of fully determining the default in RegisterUserPrefs,
+  // below.
+  bool instant_extended_default = true;
+  switch (search::GetInstantExtendedDefaultSetting()) {
+    case search::INSTANT_DEFAULT_ON:
+      instant_extended_default = true;
+      break;
+    case search::INSTANT_USE_EXISTING:
+      instant_extended_default = prefs->GetBoolean(prefs::kInstantEnabled);
+    case search::INSTANT_DEFAULT_OFF:
+      instant_extended_default = false;
+      break;
+  }
+
+  prefs->SetDefaultPrefValue(
+      prefs::kInstantExtendedEnabled,
+      Value::CreateBooleanValue(instant_extended_default));
+
+  profile_pref_registrar_.Init(prefs);
   profile_pref_registrar_.Add(
       GetInstantPrefName(profile()),
       base::Bind(&BrowserInstantController::ResetInstant,
                  base::Unretained(this)));
   profile_pref_registrar_.Add(
       prefs::kSearchSuggestEnabled,
       base::Bind(&BrowserInstantController::ResetInstant,
                  base::Unretained(this)));
   ResetInstant();
   browser_->search_model()->AddObserver(this);
 
 #if defined(ENABLE_THEMES)
   // Listen for theme installation.
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile())));
 #endif  // defined(ENABLE_THEMES)
 }
 
 BrowserInstantController::~BrowserInstantController() {
   browser_->search_model()->RemoveObserver(this);
 }
 
 bool BrowserInstantController::IsInstantEnabled(Profile* profile) {
   return profile && !profile->IsOffTheRecord() && profile->GetPrefs() &&
          profile->GetPrefs()->GetBoolean(GetInstantPrefName(profile));
 }
 
 void BrowserInstantController::RegisterUserPrefs(
-    PrefService* prefs,
     PrefRegistrySyncable* registry) {
-  // TODO(joi): Get rid of the need for PrefService param above.
   registry->RegisterBooleanPref(prefs::kInstantConfirmDialogShown, false,
                                 PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(prefs::kInstantEnabled, false,
                                 PrefRegistrySyncable::SYNCABLE_PREF);
 
-  bool instant_extended_default = true;
-  switch (search::GetInstantExtendedDefaultSetting()) {
-    case search::INSTANT_DEFAULT_ON:
-      instant_extended_default = true;
-      break;
-    case search::INSTANT_USE_EXISTING:
-      instant_extended_default = prefs->GetBoolean(prefs::kInstantEnabled);
-      break;
-    case search::INSTANT_DEFAULT_OFF:
-      instant_extended_default = false;
-      break;
-  }
-
+  // Note that the default for this pref gets reset in the
+  // BrowserInstantController constructor.
   registry->RegisterBooleanPref(prefs::kInstantExtendedEnabled,
-                                instant_extended_default,
+                                false,
                                 PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 bool BrowserInstantController::MaybeSwapInInstantNTPContents(
     const GURL& url,
     content::WebContents* source_contents,
     content::WebContents** target_contents) {
   if (url != GURL(chrome::kChromeUINewTabURL))
     return false;
 
@@ skipping 235 matching lines @@
     initialized_theme_info_ = true;
   }
 
   DCHECK(initialized_theme_info_);
 
   if (browser_->search_model()->mode().is_ntp())
     instant_.ThemeChanged(theme_info_);
 }
 
 }  // namespace chrome