chrome/browser/prefs/browser_prefs.cc - Issue 12335141: Move c/b/ui/search/search.* to c/b/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 12335141: Move c/b/ui/search/search.* to c/b/instant/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 7 years, 9 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:

Index: chrome/browser/prefs/browser_prefs.cc

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

index 9e61f0a8af3c0543394a999da741e28ffef389ef..cf062bed898418905f65e75d65140e4652abbe77 100644

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

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

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

#include "chrome/browser/google/google_url_tracker.h"

#include "chrome/browser/google/google_url_tracker_factory.h"

#include "chrome/browser/gpu/gl_string_manager.h"

+#include "chrome/browser/instant/search.h"

#include "chrome/browser/intranet_redirect_detector.h"

#include "chrome/browser/io_thread.h"

#include "chrome/browser/managed_mode/managed_mode.h"

@@ -74,7 +75,6 @@

#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"