Rename gfx::Display/Screen to display::Display/Screen in ash

ash/display/resolution_notification_controller.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_DISPLAY_RESOLUTION_NOTIFICATION_CONTROLLER_H_
 #define ASH_DISPLAY_RESOLUTION_NOTIFICATION_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include "ash/ash_export.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/timer/timer.h"
-#include "ui/gfx/display_observer.h"
+#include "ui/display/display_observer.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace chromeos {
 FORWARD_DECLARE_TEST(DisplayPreferencesTest, PreventStore);
 }  // namespace chromeos
 
 namespace views {
 class Label;
 class Widget;
 }  // namespace views
 
 namespace ash {
 
 struct DisplayMode;
 
 // A class which manages the notification of display resolution change and
 // also manages the timeout in case the new resolution is unusable.
 class ASH_EXPORT ResolutionNotificationController
-    : public gfx::DisplayObserver,
+    : public display::DisplayObserver,
       public WindowTreeHostManager::Observer {
  public:
   ResolutionNotificationController();
   ~ResolutionNotificationController() override;
 
   // Prepare a resolution change notification for |display_id| from
   // |old_resolution| to |new_resolution|, which offers a button to revert the
   // change in case something goes wrong. The notification times out if there's
   // only one display connected and the user is trying to modify its resolution.
   // In that case, the timeout has to be set since the user cannot make any
@@ skipping 35 matching lines @@
 
   // Create a new notification, or update its content if it already exists.
   // |enable_spoken_feedback| is set to false when the notification is updated
   // during the countdown so the update isn't necessarily read by the spoken
   // feedback.
   void CreateOrUpdateNotification(bool enable_spoken_feedback);
 
   // Called every second for timeout.
   void OnTimerTick();
 
-  // gfx::DisplayObserver overrides:
-  void OnDisplayAdded(const gfx::Display& new_display) override;
-  void OnDisplayRemoved(const gfx::Display& old_display) override;
-  void OnDisplayMetricsChanged(const gfx::Display& display,
+  // display::DisplayObserver overrides:
+  void OnDisplayAdded(const display::Display& new_display) override;
+  void OnDisplayRemoved(const display::Display& old_display) override;
+  void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t metrics) override;
 
   // WindowTreeHostManager::Observer overrides:
   void OnDisplayConfigurationChanged() override;
 
   static void SuppressTimerForTest();
 
   std::unique_ptr<ResolutionChangeInfo> change_info_;
 
   DISALLOW_COPY_AND_ASSIGN(ResolutionNotificationController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_RESOLUTION_NOTIFICATION_CONTROLLER_H_