Remove chromeos from file names in ash/display

ash is cros only so we don't need suffix any more. done by mass-rename.sh script. Display_animator_chromeos will be handled in a separate CL as I have to merge two files. BUG=None TEST=All test should pass. Change-Id: I824b69de4db0c787de926963a562cfb0dde64d70 Reviewed-on: https://chromium-review.googlesource.com/967457 Reviewed-by: Malay Keshav <malaykeshav@chromium.org> Commit-Queue: Mitsuru Oshima <oshima@chromium.org> Cr-Commit-Position: refs/heads/master@{#543905}
marcosholgado · Mar 17, 2018 · f51c8b4 · f51c8b4
1 parent 46fa3aa
commit f51c8b4
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 29 deletions.
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
@@ -117,12 +117,12 @@ component("ash") {
     "display/display_animator.h",
     "display/display_animator_chromeos.cc",
     "display/display_animator_chromeos.h",
-    "display/display_color_manager_chromeos.cc",
-    "display/display_color_manager_chromeos.h",
+    "display/display_color_manager.cc",
+    "display/display_color_manager.h",
     "display/display_configuration_controller.cc",
     "display/display_configuration_controller.h",
-    "display/display_error_observer_chromeos.cc",
-    "display/display_error_observer_chromeos.h",
+    "display/display_error_observer.cc",
+    "display/display_error_observer.h",
     "display/display_move_window_util.cc",
     "display/display_move_window_util.h",
     "display/display_shutdown_observer.cc",
@@ -148,8 +148,8 @@ component("ash") {
     "display/persistent_window_controller.h",
     "display/persistent_window_info.cc",
     "display/persistent_window_info.h",
-    "display/projecting_observer_chromeos.cc",
-    "display/projecting_observer_chromeos.h",
+    "display/projecting_observer.cc",
+    "display/projecting_observer.h",
     "display/resolution_notification_controller.cc",
     "display/resolution_notification_controller.h",
     "display/root_window_transformers.cc",
@@ -1440,17 +1440,17 @@ test("ash_unittests") {
     "detachable_base/detachable_base_notification_controller_unittest.cc",
     "dip_unittest.cc",
     "display/cursor_window_controller_unittest.cc",
-    "display/display_color_manager_chromeos_unittest.cc",
+    "display/display_color_manager_unittest.cc",
     "display/display_configuration_controller_unittest.cc",
-    "display/display_error_observer_chromeos_unittest.cc",
+    "display/display_error_observer_unittest.cc",
     "display/display_manager_unittest.cc",
     "display/display_move_window_util_unittest.cc",
     "display/display_util_unittest.cc",
     "display/extended_mouse_warp_controller_unittest.cc",
     "display/mirror_window_controller_unittest.cc",
     "display/mouse_cursor_event_filter_unittest.cc",
     "display/persistent_window_controller_unittest.cc",
-    "display/projecting_observer_chromeos_unittest.cc",
+    "display/projecting_observer_unittest.cc",
     "display/resolution_notification_controller_unittest.cc",
     "display/root_window_transformers_unittest.cc",
     "display/screen_ash_unittest.cc",

diff --git a/ash/display/DEPS b/ash/display/DEPS
@@ -4,7 +4,7 @@ include_rules = [
 ]
 
 specific_include_rules = {
-  "display_color_manager_chromeos.cc": [
+  "display_color_manager.cc": [
     "+third_party/qcms/src/qcms.h",
   ],
   "screen_orientation_controller_(chromeos|test_api)\.h": [

diff --git a/...display/display_color_manager_chromeos.cc → ash/display/display_color_manager.cc b/...display/display_color_manager_chromeos.cc → ash/display/display_color_manager.cc
@@ -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 "ash/display/display_color_manager_chromeos.h"
+#include "ash/display/display_color_manager.h"
 
 #include <utility>
 

diff --git a/ash/display/display_color_manager_chromeos.h → ash/display/display_color_manager.h b/ash/display/display_color_manager_chromeos.h → ash/display/display_color_manager.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 ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_
-#define ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_
+#ifndef ASH_DISPLAY_DISPLAY_COLOR_MANAGER_H_
+#define ASH_DISPLAY_DISPLAY_COLOR_MANAGER_H_
 
 #include <stdint.h>
 
@@ -86,4 +86,4 @@ class ASH_EXPORT DisplayColorManager
 
 }  // namespace ash
 
-#endif  // ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_
+#endif  // ASH_DISPLAY_DISPLAY_COLOR_MANAGER_H_
diff --git a/...isplay_color_manager_chromeos_unittest.cc → ...display/display_color_manager_unittest.cc b/...isplay_color_manager_chromeos_unittest.cc → ...display/display_color_manager_unittest.cc
@@ -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 "ash/display/display_color_manager_chromeos.h"
+#include "ash/display/display_color_manager.h"
 
 #include <memory>
 

diff --git a/...isplay/display_error_observer_chromeos.cc → ash/display/display_error_observer.cc b/...isplay/display_error_observer_chromeos.cc → ash/display/display_error_observer.cc
@@ -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 "ash/display/display_error_observer_chromeos.h"
+#include "ash/display/display_error_observer.h"
 
 #include "ash/display/display_util.h"
 #include "ash/strings/grit/ash_strings.h"
@@ -36,7 +36,7 @@ void DisplayErrorObserver::OnDisplayModeChangeFailed(
   if (internal_display_failed && displays.size() == 1u) {
     // If the internal display is the only display that failed, don't show this
     // notification to the user, as it's confusing and less helpful.
-    // crbug.com/775197.
+    // https://crbug.com/775197.
     return;
   }
 

diff --git a/...display/display_error_observer_chromeos.h → ash/display/display_error_observer.h b/...display/display_error_observer_chromeos.h → ash/display/display_error_observer.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 ASH_DISPLAY_DISPLAY_ERROR_OBSERVER_CHROMEOS_H_
-#define ASH_DISPLAY_DISPLAY_ERROR_OBSERVER_CHROMEOS_H_
+#ifndef ASH_DISPLAY_DISPLAY_ERROR_OBSERVER_H_
+#define ASH_DISPLAY_DISPLAY_ERROR_OBSERVER_H_
 
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
@@ -32,4 +32,4 @@ class ASH_EXPORT DisplayErrorObserver
 
 }  // namespace ash
 
-#endif  // ASH_DISPLAY_DISPLAY_ERROR_OBSERVER_CHROMEOS_H_
+#endif  // ASH_DISPLAY_DISPLAY_ERROR_OBSERVER_H_
diff --git a/...splay_error_observer_chromeos_unittest.cc → ...isplay/display_error_observer_unittest.cc b/...splay_error_observer_chromeos_unittest.cc → ...isplay/display_error_observer_unittest.cc
@@ -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 "ash/display/display_error_observer_chromeos.h"
+#include "ash/display/display_error_observer.h"
 
 #include "ash/display/display_util.h"
 #include "ash/shell.h"

diff --git a/ash/display/projecting_observer_chromeos.cc → ash/display/projecting_observer.cc b/ash/display/projecting_observer_chromeos.cc → ash/display/projecting_observer.cc
@@ -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 "ash/display/projecting_observer_chromeos.h"
+#include "ash/display/projecting_observer.h"
 
 #include "ash/shell.h"
 #include "base/logging.h"

diff --git a/ash/display/projecting_observer_chromeos.h → ash/display/projecting_observer.h b/ash/display/projecting_observer_chromeos.h → ash/display/projecting_observer.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 ASH_DISPLAY_PROJECTING_OBSERVER_CHROMEOS_H_
-#define ASH_DISPLAY_PROJECTING_OBSERVER_CHROMEOS_H_
+#ifndef ASH_DISPLAY_PROJECTING_OBSERVER_H_
+#define ASH_DISPLAY_PROJECTING_OBSERVER_H_
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
@@ -63,4 +63,4 @@ class ASH_EXPORT ProjectingObserver
 
 }  // namespace ash
 
-#endif  // ASH_DISPLAY_PROJECTING_OBSERVER_CHROMEOS_H_
+#endif  // ASH_DISPLAY_PROJECTING_OBSERVER_H_
diff --git a/.../projecting_observer_chromeos_unittest.cc → ash/display/projecting_observer_unittest.cc b/.../projecting_observer_chromeos_unittest.cc → ash/display/projecting_observer_unittest.cc
@@ -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 "ash/display/projecting_observer_chromeos.h"
+#include "ash/display/projecting_observer.h"
 
 #include <memory>
 #include <vector>

diff --git a/ash/shell.cc b/ash/shell.cc
@@ -25,14 +25,14 @@
 #include "ash/detachable_base/detachable_base_notification_controller.h"
 #include "ash/display/ash_display_controller.h"
 #include "ash/display/cursor_window_controller.h"
-#include "ash/display/display_color_manager_chromeos.h"
+#include "ash/display/display_color_manager.h"
 #include "ash/display/display_configuration_controller.h"
-#include "ash/display/display_error_observer_chromeos.h"
+#include "ash/display/display_error_observer.h"
 #include "ash/display/display_shutdown_observer.h"
 #include "ash/display/event_transformation_handler.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/display/persistent_window_controller.h"
-#include "ash/display/projecting_observer_chromeos.h"
+#include "ash/display/projecting_observer.h"
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/display/screen_ash.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"