MacViews: Rename Cocoa files to avoid conflict with Views.

cocoa/media_indicator_button.* is renamed to media_indicator_button_cocoa.* to
avoid conflict with views/media_indicator_button.*

BUG=425229

Review URL: https://codereview.chromium.org/797393003

Cr-Commit-Position: refs/heads/master@{#308439}

chrome/browser/ui/cocoa/tabs/media_indicator_button.h → chrome/browser/ui/cocoa/tabs/media_indicator_button_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_TABS_MEDIA_INDICATOR_BUTTON_H_
-#define CHROME_BROWSER_UI_COCOA_TABS_MEDIA_INDICATOR_BUTTON_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TABS_MEDIA_INDICATOR_BUTTON_COCOA_H_
+#define CHROME_BROWSER_UI_COCOA_TABS_MEDIA_INDICATOR_BUTTON_COCOA_H_
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
@@ -74,4 +74,4 @@ class AnimationDelegate;
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_TABS_MEDIA_INDICATOR_BUTTON_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TABS_MEDIA_INDICATOR_BUTTON_COCOA_H_

chrome/browser/ui/cocoa/tabs/media_indicator_button.mm → chrome/browser/ui/cocoa/tabs/media_indicator_button_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/tabs/media_indicator_button.h"
+#import "chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.h"
 
 #include "base/logging.h"
 #include "base/thread_task_runner_handle.h"

chrome/browser/ui/cocoa/tabs/media_indicator_button_unittest.mm → chrome/browser/ui/cocoa/tabs/media_indicator_button_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/tabs/media_indicator_button.h"
+#import "chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.h"
 
 #include <string>
 

chrome/browser/ui/cocoa/tabs/tab_controller.mm

@@ -13,7 +13,7 @@
 #import "chrome/browser/themes/theme_properties.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/sprite_view.h"
-#import "chrome/browser/ui/cocoa/tabs/media_indicator_button.h"
+#import "chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"

chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm

@@ -7,7 +7,7 @@
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/tabs/media_indicator_button.h"
+#import "chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h"

chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

@@ -34,7 +34,7 @@
 #import "chrome/browser/ui/cocoa/new_tab_button.h"
 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"
 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
-#import "chrome/browser/ui/cocoa/tabs/media_indicator_button.h"
+#import "chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"

chrome/browser/ui/cocoa/tabs/tab_view.mm

@@ -9,7 +9,7 @@
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/themes/theme_service.h"
-#import "chrome/browser/ui/cocoa/tabs/media_indicator_button.h"
+#import "chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"

chrome/chrome_browser_ui.gypi

@@ -695,8 +695,8 @@
       'browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm',
       'browser/ui/cocoa/table_row_nsimage_cache.h',
       'browser/ui/cocoa/table_row_nsimage_cache.mm',
-      'browser/ui/cocoa/tabs/media_indicator_button.h',
-      'browser/ui/cocoa/tabs/media_indicator_button.mm',
+      'browser/ui/cocoa/tabs/media_indicator_button_cocoa.h',
+      'browser/ui/cocoa/tabs/media_indicator_button_cocoa.mm',
       'browser/ui/cocoa/tabs/tab_controller.h',
       'browser/ui/cocoa/tabs/tab_controller.mm',
       'browser/ui/cocoa/tabs/tab_strip_background_view.h',

chrome/chrome_tests_unit.gypi

@@ -1112,7 +1112,7 @@
       'browser/ui/cocoa/tab_contents/sad_tab_controller_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_button_unittest.mm',
+      'browser/ui/cocoa/tabs/media_indicator_button_cocoa_unittest.mm',
       'browser/ui/cocoa/tabs/tab_controller_unittest.mm',
       'browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm',
       'browser/ui/cocoa/tabs/tab_strip_view_unittest.mm',