chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm - Issue 686993002: MacViews: Rename files to avoid duplicate basename conflicts.

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 686993002: MacViews: Rename files to avoid duplicate basename conflicts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/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 fc99112305abceab8a522303c56b145fb15c28b7..f09d157f4d8605e00155b5d45fd2f6101174ad9b 100644

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

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

@@ -28,7 +28,7 @@

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

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

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

-#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h"

+#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h"

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

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

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

« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm » ('j') | no next file with comments »