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

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

index 4ab5eca337e4ff17895dcecbe5ff4001a2ab1a47..470e9d7e6f86cbb20da17dd94dcc2eebe9f4ee2b 100644

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

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

@@ -14,6 +14,7 @@

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

#include "chrome/browser/bookmarks/bookmark_utils.h"

#include "chrome/browser/extensions/extension_service.h"

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

#include "chrome/browser/prefs/incognito_mode_prefs.h"

#include "chrome/browser/profiles/profile.h"

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

@@ -44,7 +45,6 @@

#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

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

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

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

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

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"