chrome/chrome_browser_ui.gypi - 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/chrome_browser_ui.gypi

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/chrome_browser_ui.gypi

diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi

index b2eaefb4f15eaf255a56457f247401a6856db643..53ab934c7dc9b62a3e16572ed11f7dd02b22674a 100644

--- a/chrome/chrome_browser_ui.gypi

+++ b/chrome/chrome_browser_ui.gypi

@@ -262,8 +262,8 @@

'browser/ui/cocoa/bookmarks/bookmark_bar_state.h',

'browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h',

'browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm',

- 'browser/ui/cocoa/bookmarks/bookmark_bar_view.h',

- 'browser/ui/cocoa/bookmarks/bookmark_bar_view.mm',

+ 'browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h',

+ 'browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm',

'browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h',

'browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm',

'browser/ui/cocoa/bookmarks/bookmark_button.h',

@@ -384,8 +384,8 @@

'browser/ui/cocoa/download/download_shelf_controller.mm',

'browser/ui/cocoa/download/download_shelf_mac.h',

'browser/ui/cocoa/download/download_shelf_mac.mm',

- 'browser/ui/cocoa/download/download_shelf_view.h',

- 'browser/ui/cocoa/download/download_shelf_view.mm',

+ 'browser/ui/cocoa/download/download_shelf_view_cocoa.h',

+ 'browser/ui/cocoa/download/download_shelf_view_cocoa.mm',

'browser/ui/cocoa/download/download_show_all_button.h',

'browser/ui/cocoa/download/download_show_all_button.mm',

'browser/ui/cocoa/download/download_show_all_cell.h',

@@ -625,7 +625,7 @@

'browser/ui/cocoa/passwords/manage_passwords_bubble_never_save_view_controller.mm',

'browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller.h',

'browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller.mm',

- 'browser/ui/cocoa/pdf_password_dialog.mm',

+ 'browser/ui/cocoa/pdf_password_dialog_cocoa.mm',

'browser/ui/cocoa/presentation_mode_controller.h',

'browser/ui/cocoa/presentation_mode_controller.mm',

'browser/ui/cocoa/profiles/avatar_base_controller.h',

@@ -679,8 +679,8 @@

'browser/ui/cocoa/tab_contents/overlayable_contents_controller.mm',

'browser/ui/cocoa/tab_contents/sad_tab_controller.h',

'browser/ui/cocoa/tab_contents/sad_tab_controller.mm',

- 'browser/ui/cocoa/tab_contents/sad_tab_view.h',

- 'browser/ui/cocoa/tab_contents/sad_tab_view.mm',

+ 'browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h',

+ 'browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.mm',

'browser/ui/cocoa/tab_contents/tab_contents_controller.h',

'browser/ui/cocoa/tab_contents/tab_contents_controller.mm',

'browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h',

« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/sad_tab_view_unittest.mm ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »