chrome/browser/ui/search/instant_controller.cc - Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search.

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/search/instant_controller.cc

Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search. (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/search/instant_controller.cc

diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc

similarity index 99%

rename from chrome/browser/instant/instant_controller.cc

rename to chrome/browser/ui/search/instant_controller.cc

index 924688cd55c07bed903e89b8815dbc50decca666..05a388e2dd34e194ece9d88d1465524841de9162 100644

--- a/chrome/browser/instant/instant_controller.cc

+++ b/chrome/browser/ui/search/instant_controller.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/browser/instant/instant_controller.h"

+#include "chrome/browser/ui/search/instant_controller.h"

#include "base/metrics/histogram.h"

#include "base/string_util.h"

@@ -13,17 +13,17 @@

#include "chrome/browser/history/history_service_factory.h"

#include "chrome/browser/history/history_tab_helper.h"

#include "chrome/browser/history/top_sites.h"

-#include "chrome/browser/instant/instant_ntp.h"

-#include "chrome/browser/instant/instant_overlay.h"

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

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

-#include "chrome/browser/instant/instant_tab.h"

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

#include "chrome/browser/platform_util.h"

#include "chrome/browser/search_engines/search_terms_data.h"

#include "chrome/browser/search_engines/template_url_service.h"

#include "chrome/browser/search_engines/template_url_service_factory.h"

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

+#include "chrome/browser/ui/search/instant_ntp.h"

+#include "chrome/browser/ui/search/instant_overlay.h"

+#include "chrome/browser/ui/search/instant_tab.h"

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"