MacViews: Rename files to avoid duplicate basename conflicts.
Rename files to avoid duplicate basename conflicts between Cocoa and Views
files.
BUG=425229
Review URL: https://codereview.chromium.org/686993002
Cr-Commit-Position: refs/heads/master@{#301858}
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index fc99112..f09d157 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"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index 65a4353..821cdee 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -18,7 +18,7 @@
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.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"
#include "chrome/browser/ui/cocoa/cocoa_profile_test.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 f997008..f123576 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_
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm
similarity index 98%
rename from chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm
rename to chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm
index 157bf5a..c778263 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h"
+#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h"
#include "chrome/browser/profiles/profile.h"
#import "chrome/browser/themes/theme_properties.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm
similarity index 98%
rename from chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm
rename to chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm
index 4e18604..4e6d9a4 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm
@@ -8,7 +8,7 @@
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/profiles/profile.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.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_folder_target.h"
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm
index 93ec81b..adfaa5c 100644
--- a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm
+++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm
@@ -18,7 +18,7 @@
#import "chrome/browser/ui/cocoa/browser_window_controller.h"
#include "chrome/browser/ui/cocoa/download/download_item_controller.h"
#include "chrome/browser/ui/cocoa/download/download_shelf_mac.h"
-#import "chrome/browser/ui/cocoa/download/download_shelf_view.h"
+#import "chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.h"
#import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
#include "content/public/browser/download_item.h"
#include "content/public/browser/download_manager.h"
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_view.h b/chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.h
similarity index 76%
rename from chrome/browser/ui/cocoa/download/download_shelf_view.h
rename to chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.h
index 59bb936..fabf4ad9 100644
--- a/chrome/browser/ui/cocoa/download/download_shelf_view.h
+++ b/chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_COCOA_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_
-#define CHROME_BROWSER_UI_COCOA_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_
+#ifndef CHROME_BROWSER_UI_COCOA_DOWNLOAD_DOWNLOAD_SHELF_VIEW_COCOA_H_
+#define CHROME_BROWSER_UI_COCOA_DOWNLOAD_DOWNLOAD_SHELF_VIEW_COCOA_H_
#import <Cocoa/Cocoa.h>
@@ -16,4 +16,4 @@
}
@end
-#endif // CHROME_BROWSER_UI_COCOA_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_
+#endif // CHROME_BROWSER_UI_COCOA_DOWNLOAD_DOWNLOAD_SHELF_VIEW_COCOA_H_
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_view.mm b/chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.mm
similarity index 97%
rename from chrome/browser/ui/cocoa/download/download_shelf_view.mm
rename to chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.mm
index 7563b0c..c170c1b 100644
--- a/chrome/browser/ui/cocoa/download/download_shelf_view.mm
+++ b/chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import "chrome/browser/ui/cocoa/download/download_shelf_view.h"
+#import "chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.h"
#include "chrome/browser/themes/theme_properties.h"
#include "chrome/browser/themes/theme_service.h"
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_view_unittest.mm b/chrome/browser/ui/cocoa/download/download_shelf_view_cocoa_unittest.mm
similarity index 90%
rename from chrome/browser/ui/cocoa/download/download_shelf_view_unittest.mm
rename to chrome/browser/ui/cocoa/download/download_shelf_view_cocoa_unittest.mm
index cf22c695..7f037d78d 100644
--- a/chrome/browser/ui/cocoa/download/download_shelf_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/download/download_shelf_view_cocoa_unittest.mm
@@ -4,7 +4,7 @@
#include "base/mac/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/download/download_shelf_view.h"
+#import "chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
diff --git a/chrome/browser/ui/cocoa/pdf_password_dialog.mm b/chrome/browser/ui/cocoa/pdf_password_dialog_cocoa.mm
similarity index 100%
rename from chrome/browser/ui/cocoa/pdf_password_dialog.mm
rename to chrome/browser/ui/cocoa/pdf_password_dialog_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm
index 70732b0..18ffd42 100644
--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm
@@ -6,7 +6,7 @@
#include "base/mac/bundle_locations.h"
#include "base/mac/mac_util.h"
-#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h"
+#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h"
#include "content/public/browser/web_contents.h"
namespace chrome {
diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm
index 0a813a40..b93c190 100644
--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm
@@ -6,7 +6,7 @@
#include "base/mac/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
-#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h"
+#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/testing_profile.h"
#import "ui/base/cocoa/controls/hyperlink_text_view.h"
diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h
similarity index 83%
rename from chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h
rename to chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h
index 5219b997..630f3c48 100644
--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_VIEW_H_
-#define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_VIEW_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_VIEW_COCOA_H_
+#define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_VIEW_COCOA_H_
#include "base/mac/scoped_nsobject.h"
#include "ui/base/cocoa/base_view.h"
@@ -38,4 +38,4 @@
@end
-#endif // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_VIEW_H_
+#endif // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_VIEW_COCOA_H_
diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.mm
similarity index 98%
rename from chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm
rename to chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.mm
index c33f1c1..7560f67 100644
--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h"
+#include "chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h"
#include "base/logging.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa_unittest.mm
similarity index 90%
rename from chrome/browser/ui/cocoa/tab_contents/sad_tab_view_unittest.mm
rename to chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa_unittest.mm
index 82bf73a..6cd7030 100644
--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa_unittest.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h"
+#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
namespace {
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index b2eaefb4..53ab934 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',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 74f0d26d..5bf6e388 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -975,7 +975,7 @@
'browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm',
'browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h',
'browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm',
- 'browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm',
+ 'browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm',
'browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm',
'browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm',
'browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm',
@@ -1018,7 +1018,7 @@
'browser/ui/cocoa/download/download_item_controller_unittest.mm',
'browser/ui/cocoa/download/download_shelf_controller_unittest.mm',
'browser/ui/cocoa/download/download_shelf_mac_unittest.mm',
- 'browser/ui/cocoa/download/download_shelf_view_unittest.mm',
+ 'browser/ui/cocoa/download/download_shelf_view_cocoa_unittest.mm',
'browser/ui/cocoa/download/download_util_mac_unittest.mm',
'browser/ui/cocoa/draggable_button_unittest.mm',
'browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm',
@@ -1101,7 +1101,7 @@
'browser/ui/cocoa/styled_text_field_test_helper.mm',
'browser/ui/cocoa/styled_text_field_unittest.mm',
'browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm',
- 'browser/ui/cocoa/tab_contents/sad_tab_view_unittest.mm',
+ 'browser/ui/cocoa/tab_contents/sad_tab_view_cocoa_unittest.mm',
'browser/ui/cocoa/table_row_nsimage_cache_unittest.mm',
'browser/ui/cocoa/tabs/media_indicator_view_unittest.mm',
'browser/ui/cocoa/tabs/tab_controller_unittest.mm',
