chrome/browser/prefs/browser_prefs.cc - Issue 10967022: alternate ntp: persist show-search-provider-logo option at chrome://instant

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10967022: alternate ntp: persist show-search-provider-logo option at chrome://instant (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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

« chrome/browser/autocomplete/zero_suggest_provider.cc ('K') | « chrome/browser/autocomplete/zero_suggest_provider.cc ('k') | chrome/browser/ui/views/search_view_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index c03af7d12cab21e9d1c5d257a9bd944c409fd3fe..2b01852b23fe1a89407429bc51ad08092edc7129 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -6,7 +6,6 @@

#include "chrome/browser/about_flags.h"

#include "chrome/browser/accessibility/invert_bubble_prefs.h"

-#include "chrome/browser/autocomplete/zero_suggest_provider.h"

#include "chrome/browser/autofill/autofill_manager.h"

#include "chrome/browser/background/background_mode_manager.h"

#include "chrome/browser/bookmarks/bookmark_utils.h"

@@ -65,6 +64,7 @@

#include "chrome/browser/ui/tabs/pinned_tab_codec.h"

#include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"

#include "chrome/browser/ui/webui/flags_ui.h"

+#include "chrome/browser/ui/webui/instant_ui.h"

#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"

#include "chrome/browser/ui/webui/plugins_ui.h"

#include "chrome/browser/ui/webui/print_preview/sticky_settings.h"

@@ -224,7 +224,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {

TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);

TranslatePrefs::RegisterUserPrefs(user_prefs);

web_intents::RegisterUserPrefs(user_prefs);

- ZeroSuggestProvider::RegisterUserPrefs(user_prefs);

+ InstantUI::RegisterUserPrefs(user_prefs);

#if defined(ENABLE_CONFIGURATION_POLICY)

policy::URLBlacklistManager::RegisterPrefs(user_prefs);