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

components/exo/wayland/server.cc

 // Copyright 2015 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.
 
 #include "components/exo/wayland/server.h"
 
 #include <grp.h>
 #include <linux/input.h>
 #include <scaler-server-protocol.h>
 #include <secure-output-unstable-v1-server-protocol.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <wayland-server-core.h>
 #include <wayland-server-protocol-core.h>
 #include <xdg-shell-unstable-v5-server-protocol.h>
 
 #include <algorithm>
 #include <iterator>
 #include <string>
 #include <utility>
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
-#include "ash/display/screen_ash.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/cancelable_callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/free_deleter.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/exo/buffer.h"
 #include "components/exo/display.h"
 #include "components/exo/keyboard.h"
 #include "components/exo/keyboard_delegate.h"
 #include "components/exo/pointer.h"
 #include "components/exo/pointer_delegate.h"
 #include "components/exo/shared_memory.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/sub_surface.h"
 #include "components/exo/surface.h"
 #include "components/exo/touch.h"
 #include "components/exo/touch_delegate.h"
 #include "ipc/unix_domain_socket_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/hit_test.h"
+#include "ui/display/display_observer.h"
+#include "ui/display/screen.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
-#include "ui/gfx/display_observer.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
 #if defined(USE_OZONE)
 #include <drm_fourcc.h>
 #include <linux-dmabuf-unstable-v1-server-protocol.h>
 #include <wayland-drm-server-protocol.h>
 #endif
 
 #if defined(USE_XKBCOMMON)
@@ skipping 870 matching lines @@
   wl_resource* resource =
       wl_resource_create(client, &wl_shell_interface, 1, id);
 
   wl_resource_set_implementation(resource, &shell_implementation, data,
                                  nullptr);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // wl_output_interface:
 
-wl_output_transform OutputTransform(gfx::Display::Rotation rotation) {
+wl_output_transform OutputTransform(display::Display::Rotation rotation) {
   switch (rotation) {
-    case gfx::Display::ROTATE_0:
+    case display::Display::ROTATE_0:
       return WL_OUTPUT_TRANSFORM_NORMAL;
-    case gfx::Display::ROTATE_90:
+    case display::Display::ROTATE_90:
       return WL_OUTPUT_TRANSFORM_90;
-    case gfx::Display::ROTATE_180:
+    case display::Display::ROTATE_180:
       return WL_OUTPUT_TRANSFORM_180;
-    case gfx::Display::ROTATE_270:
+    case display::Display::ROTATE_270:
       return WL_OUTPUT_TRANSFORM_270;
   }
   NOTREACHED();
   return WL_OUTPUT_TRANSFORM_NORMAL;
 }
 
-class WaylandDisplayObserver : public gfx::DisplayObserver {
+class WaylandDisplayObserver : public display::DisplayObserver {
  public:
-  WaylandDisplayObserver(const gfx::Display& display,
+  WaylandDisplayObserver(const display::Display& display,
                          wl_resource* output_resource)
       : display_id_(display.id()), output_resource_(output_resource) {
-    gfx::Screen::GetScreen()->AddObserver(this);
+    display::Screen::GetScreen()->AddObserver(this);
     SendDisplayMetrics(display);
   }
   ~WaylandDisplayObserver() override {
-    gfx::Screen::GetScreen()->RemoveObserver(this);
+    display::Screen::GetScreen()->RemoveObserver(this);
   }
 
-  // Overridden from gfx::DisplayObserver:
-  void OnDisplayAdded(const gfx::Display& new_display) override {}
-  void OnDisplayRemoved(const gfx::Display& new_display) override {}
-  void OnDisplayMetricsChanged(const gfx::Display& display,
+  // Overridden from display::DisplayObserver:
+  void OnDisplayAdded(const display::Display& new_display) override {}
+  void OnDisplayRemoved(const display::Display& new_display) override {}
+  void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t changed_metrics) override {
     if (display.id() != display_id_)
       return;
 
     if (changed_metrics &
         (DISPLAY_METRIC_BOUNDS | DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
          DISPLAY_METRIC_ROTATION)) {
       SendDisplayMetrics(display);
     }
   }
 
  private:
-  void SendDisplayMetrics(const gfx::Display& display) {
+  void SendDisplayMetrics(const display::Display& display) {
     const ash::DisplayInfo& info =
         ash::Shell::GetInstance()->display_manager()->GetDisplayInfo(
             display.id());
 
     const float kInchInMm = 25.4f;
     const char* kUnknownMake = "unknown";
     const char* kUnknownModel = "unknown";
 
     gfx::Rect bounds = info.bounds_in_native();
     wl_output_send_geometry(
@@ skipping 28 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WaylandDisplayObserver);
 };
 
 const uint32_t output_version = 2;
 
 void bind_output(wl_client* client, void* data, uint32_t version, uint32_t id) {
   wl_resource* resource = wl_resource_create(
       client, &wl_output_interface, std::min(version, output_version), id);
 
   // TODO(reveman): Multi-display support.
-  const gfx::Display& display = ash::Shell::GetInstance()
-                                    ->display_manager()
-                                    ->GetPrimaryDisplayCandidate();
+  const display::Display& display = ash::Shell::GetInstance()
+                                        ->display_manager()
+                                        ->GetPrimaryDisplayCandidate();
 
   SetImplementation(
       resource, nullptr,
       base::WrapUnique(new WaylandDisplayObserver(display, resource)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // xdg_surface_interface:
 
 int XdgResizeComponent(uint32_t edges) {
@@ skipping 1094 matching lines @@
   DCHECK(event_loop);
   wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
 }
 
 void Server::Flush() {
   wl_display_flush_clients(wl_display_.get());
 }
 
 }  // namespace wayland
 }  // namespace exo