chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm - Issue 657443004: MacViews: Get views based toolbar to compile on the Mac.

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/toolbar/toolbar_controller.mm

Issue 657443004: MacViews: Get views based toolbar to compile on the Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@views-findbar

Patch Set: Rebase Created 6 years, 2 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

index f6100a3698c4dfea23891e8c115600e1f3a44091..a33f9a33888889e3ee24e189fb6be45b908c5e7d 100644

--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

@@ -35,9 +35,9 @@

#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

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

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

-#import "chrome/browser/ui/cocoa/toolbar/reload_button.h"

-#import "chrome/browser/ui/cocoa/toolbar/toolbar_button.h"

-#import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h"

+#import "chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.h"

+#import "chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h"

+#import "chrome/browser/ui/cocoa/toolbar/toolbar_view_cocoa.h"

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

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

#import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"

« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/toolbar_controller.h ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_view.h » ('j') | no next file with comments »