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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 12386019: Instant: Use only one hidden WebContents per profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index b8c81a8666683efb9cbf334293318c0f882d49b6..eae60c8555054fbb1164c56bb85f80dfb4a5c2c0 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -72,10 +72,10 @@
#include "chrome/browser/ui/alternate_error_tab_observer.h"
#include "chrome/browser/ui/app_list/app_list_service.h"
#include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
-#include "chrome/browser/ui/browser_instant_controller.h"
#include "chrome/browser/ui/browser_ui_prefs.h"
#include "chrome/browser/ui/network_profile_bubble.h"
#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
+#include "chrome/browser/ui/search/search.h"
#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
#include "chrome/browser/ui/startup/autolaunch_prompt.h"
#include "chrome/browser/ui/tabs/pinned_tab_codec.h"
@@ -266,8 +266,8 @@ void RegisterUserPrefs(PrefService* user_prefs,
AutofillManager::RegisterUserPrefs(registry);
BookmarkPromptPrefs::RegisterUserPrefs(registry);
bookmark_utils::RegisterUserPrefs(registry);
- BrowserInstantController::RegisterUserPrefs(user_prefs, registry);
browser_sync::SyncPrefs::RegisterUserPrefs(registry);
+ chrome::search::RegisterUserPrefs(registry);
ChromeContentBrowserClient::RegisterUserPrefs(registry);
ChromeDownloadManagerDelegate::RegisterUserPrefs(registry);
ChromeVersionService::RegisterUserPrefs(registry);

Powered by Google App Engine
This is Rietveld 408576698