chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h - 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_view_cocoa.h

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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h

similarity index 89%

rename from chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h

rename to chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h

index f997008832a51c3b0b636e4bfec02e9b86cd40e8..f123576870b273266aa57d453b4caf79156535ab 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h

@@ -5,8 +5,8 @@

// A simple custom NSView for the bookmark bar used to prevent clicking and

// dragging from moving the browser window.

-#ifndef CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_VIEW_H_

-#define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_VIEW_H_

+#ifndef CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_VIEW_COCOA_H_

+#define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_VIEW_COCOA_H_

#import <Cocoa/Cocoa.h>

@@ -58,4 +58,4 @@

}

@end

-#endif // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_VIEW_H_

+#endif // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_VIEW_COCOA_H_