chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm - 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/cocoa/omnibox/omnibox_popup_view_mac.mm

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/cocoa/omnibox/omnibox_popup_view_mac.mm

diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

index 956d2daeac4d9954b599fe7bb4bc98c05b5fa213..eae9c69d76fdeb71f7ea57683746a30941b08939 100644

--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

@@ -9,12 +9,12 @@

#include "base/stl_util.h"

#include "base/sys_string_conversions.h"

#include "chrome/browser/autocomplete/autocomplete_match.h"

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

#include "chrome/browser/ui/cocoa/event_utils.h"

#include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"

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

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

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

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

#include "grit/theme_resources.h"

#include "skia/ext/skia_utils_mac.h"

#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"