Fix prefs registration for BrowserInstantController.

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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 30 matching lines @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/service/service_process_control.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/options/options_util.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ skipping 348 matching lines @@
 
   string16 instant_learn_more_url = ASCIIToUTF16(chrome::kInstantLearnMoreURL);
   int instant_message_id = IDS_INSTANT_PREF_WITH_WARNING;
   if (chrome::search::IsInstantExtendedAPIEnabled(
       Profile::FromWebUI(web_ui()))) {
     instant_message_id = IDS_INSTANT_EXTENDED_PREF_WITH_WARNING;
     values->SetString("instant_enabled", "instant_extended.enabled");
   } else {
     values->SetString("instant_enabled", "instant.enabled");
   }
+  // This is needed because in the instant extended case,
+  // search::GetInstantExtendedDefaultSetting may say
+  // INSTANT_USE_EXISTING, which means use the current value of
+  // kInstantEnabled. See browser_options.js for where we set the
+  // checkbox to this value.
+  //
+  // We do this both in the instant extended case and in the regular
+  // case so that there is less difference between code paths.
+  values->SetBoolean("instant_starting_value",
+                     chrome::BrowserInstantController::IsInstantEnabled(
+                         Profile::FromWebUI(web_ui())));

[Mattias Nissler (ping if slow), 2013/02/25 18:53:41]

I think this is not needed, but you just have to fix the conditional in lines
413 to 414 to pass the name of the correct pref to use to the UI - the rest
works automagically if we're lucky.

   values->SetString(
       "instantPrefAndWarning",
       l10n_util::GetStringFUTF16(instant_message_id, instant_learn_more_url));
   values->SetString("instantLearnMoreLink", instant_learn_more_url);
 
 #if defined(OS_CHROMEOS)
   const chromeos::User* user = chromeos::UserManager::Get()->GetLoggedInUser();
   values->SetString("username", user ? user->email() : std::string());
 #endif
 
@@ skipping 1031 matching lines @@
   base::FundamentalValue disabled(proxy_prefs_.IsManaged() ||
                                   is_extension_controlled);
   base::FundamentalValue extension_controlled(is_extension_controlled);
   web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
                                    disabled, extension_controlled);
 
 #endif  // !defined(OS_CHROMEOS)
 }
 
 }  // namespace options