chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.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/bookmarks/bookmark_bar_toolbar_view.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/bookmarks/bookmark_bar_toolbar_view.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm

index 03da65b24def6b7826d939032ba68a56a3eb737f..f5d6e2165c6cf28607ad3032c4c6919a50b283dc 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm

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

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"

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

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

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"

@@ -11,7 +12,6 @@

#import "chrome/browser/ui/cocoa/nsview_additions.h"

#import "chrome/browser/ui/cocoa/themed_window.h"

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

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

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

#include "grit/theme_resources.h"

#include "skia/ext/skia_utils_mac.h"