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

ash/host/ash_window_tree_host_x11.cc

 // Copyright 2014 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 "ash/host/ash_window_tree_host_x11.h"
 
+#include <X11/extensions/Xfixes.h>
+#include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
-#include <X11/extensions/XInput2.h>
-#include <X11/extensions/Xfixes.h>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/ash_window_tree_host_unified.h"
 #include "ash/host/root_window_transformer.h"
 #include "ash/ime/input_method_event_handler.h"
 #include "base/sys_info.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/display/screen.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/x11/device_list_cache_x11.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/null_event_targeter.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/screen.h"
 
 namespace ash {
 
 AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds)
     : WindowTreeHostX11(initial_bounds), transformer_helper_(this) {
   transformer_helper_.Init();
   aura::Env::GetInstance()->AddObserver(this);
 }
 
 AshWindowTreeHostX11::~AshWindowTreeHostX11() {
@@ skipping 163 matching lines @@
     case ui::ET_TOUCH_RELEASED: {
 #if defined(OS_CHROMEOS)
       XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(xev->xcookie.data);
       int64_t touch_display_id =
           ui::DeviceDataManager::GetInstance()->GetTargetDisplayForTouchDevice(
               xiev->deviceid);
       // If we don't have record of display id for this touch device, check
       // that if the event is within the bound of the root window. Note
       // that in multi-monitor case, the event position is in framebuffer
       // space so the bounds check will not work so well.
-      if (touch_display_id == gfx::Display::kInvalidDisplayID) {
+      if (touch_display_id == display::Display::kInvalidDisplayID) {
         if (base::SysInfo::IsRunningOnChromeOS() &&
             !bounds().Contains(ui::EventLocationFromNative(xev)))
           return false;
       } else {
-        gfx::Screen* screen = gfx::Screen::GetScreen();
-        gfx::Display display = screen->GetDisplayNearestWindow(window());
+        display::Screen* screen = display::Screen::GetScreen();
+        display::Display display = screen->GetDisplayNearestWindow(window());
         return touch_display_id == display.id();
       }
 #endif  // defined(OS_CHROMEOS)
       return true;
     }
     default:
       return true;
   }
 }
 void AshWindowTreeHostX11::TranslateAndDispatchLocatedEvent(
@@ skipping 51 matching lines @@
                        8,
                        PropModeReplace,
                        &value,
                        1);
     }
   }
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash