Rename gfx::Display/Screen to display::Display/Screen in views/wm

ui/views/widget/tooltip_manager_aura.cc

 // Copyright (c) 2012 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 "ui/views/widget/tooltip_manager_aura.h"
 
 #include "base/logging.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/public/tooltip_client.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // TooltipManagerAura public:
 
 TooltipManagerAura::TooltipManagerAura(Widget* widget) : widget_(widget) {
   aura::client::SetTooltipText(GetWindow(), &tooltip_text_);
@@ skipping 18 matching lines @@
   if (!root_window)
     return;
 
   gfx::Point screen_loc(
       root_window->GetHost()->dispatcher()->GetLastMouseLocationInRoot());
   aura::client::ScreenPositionClient* screen_position_client =
       aura::client::GetScreenPositionClient(root_window);
   if (!screen_position_client)
     return;
   screen_position_client->ConvertPointToScreen(root_window, &screen_loc);
-  gfx::Screen* screen = gfx::Screen::GetScreen();
+  display::Screen* screen = display::Screen::GetScreen();
   aura::Window* target = screen->GetWindowAtScreenPoint(screen_loc);
   if (!target)
     return;
   gfx::Point target_loc(screen_loc);
   screen_position_client =
       aura::client::GetScreenPositionClient(target->GetRootWindow());
   if (!screen_position_client)
     return;
   screen_position_client->ConvertPointFromScreen(target, &target_loc);
   target = target->GetEventHandlerForPoint(target_loc);
@@ skipping 77 matching lines @@
   aura::client::SetTooltipId(GetWindow(), target);
 
   aura::client::GetTooltipClient(root_window)->UpdateTooltip(GetWindow());
 }
 
 aura::Window* TooltipManagerAura::GetWindow() {
   return widget_->GetNativeView();
 }
 
 }  // namespace views.