chrome/browser/ui/browser_instant_controller.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/ui/browser_instant_controller.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/ui/browser_instant_controller.cc

diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc

index 1cf312c7a594909d07faebf4ad8d16699ecd2653..d1628b1994467936d7433214fd9b63f4fad07505 100644

--- a/chrome/browser/ui/browser_instant_controller.cc

+++ b/chrome/browser/ui/browser_instant_controller.cc

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

#include "base/prefs/pref_service.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_web_ui.h"

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

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/themes/theme_properties.h"

#include "chrome/browser/themes/theme_service.h"

@@ -15,7 +16,6 @@

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/omnibox/location_bar.h"

#include "chrome/browser/ui/omnibox/omnibox_view.h"

-#include "chrome/browser/ui/search/search.h"

#include "chrome/browser/ui/search/search_tab_helper.h"

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

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