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

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index e08450bdb74001dc757a649df102598529207dfa..17f74aac9e49d835f0c294d2855911565380e5ce 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

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

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

#include "chrome/browser/instant/instant_service.h"

#include "chrome/browser/instant/instant_service_factory.h"

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

#include "chrome/browser/media/media_capture_devices_dispatcher.h"

#include "chrome/browser/nacl_host/nacl_process_host.h"

#include "chrome/browser/net/chrome_net_log.h"

@@ -73,7 +74,6 @@

#include "chrome/browser/tab_contents/tab_util.h"

#include "chrome/browser/toolkit_extra_parts.h"

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

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

#include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"

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

#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"

« no previous file with comments | « chrome/browser/autocomplete/search_provider_unittest.cc ('k') | chrome/browser/favicon/DEPS » ('j') | no next file with comments »