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

diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc

index c04a3bb49befbaa28b02324b7a7a3359fa527821..bb5c0c5ee219c71054e275546ac5152aa832fed5 100644

--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc

+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc

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

#include "chrome/browser/command_updater.h"

#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"

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

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

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

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

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

@@ -47,6 +46,7 @@

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

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

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

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

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"