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

ui/views/corewm/tooltip_controller.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/corewm/tooltip_controller.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
+#include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/screen.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/views/corewm/tooltip.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/wm/public/drag_drop_client.h"
 
 namespace views {
 namespace corewm {
 namespace {
 
 const int kTooltipTimeoutMs = 500;
@@ skipping 56 matching lines @@
           }
         }
         return event_target;
       }
 
       // If |target| has capture all events go to it, even if the mouse is
       // really over another window. Find the real window the mouse is over.
       gfx::Point screen_loc(event.location());
       aura::client::GetScreenPositionClient(event_target->GetRootWindow())->
           ConvertPointToScreen(event_target, &screen_loc);
-      gfx::Screen* screen = gfx::Screen::GetScreen();
+      display::Screen* screen = display::Screen::GetScreen();
       aura::Window* target = screen->GetWindowAtScreenPoint(screen_loc);
       if (!target)
         return NULL;
       gfx::Point target_loc(screen_loc);
       aura::client::GetScreenPositionClient(target->GetRootWindow())->
           ConvertPointFromScreen(target, &target_loc);
       aura::Window* screen_target = target->GetEventHandlerForPoint(target_loc);
       if (!IsValidTarget(event_target, screen_target))
         return NULL;
 
@@ skipping 85 matching lines @@
 }
 
 void TooltipController::OnMouseEvent(ui::MouseEvent* event) {
   switch (event->type()) {
     case ui::ET_MOUSE_CAPTURE_CHANGED:
     case ui::ET_MOUSE_EXITED:
     case ui::ET_MOUSE_MOVED:
     case ui::ET_MOUSE_DRAGGED: {
       curr_mouse_loc_ = event->location();
       aura::Window* target = NULL;
-      // Avoid a call to gfx::Screen::GetWindowAtScreenPoint() since it can be
-      // very expensive on X11 in cases when the tooltip is hidden anyway.
+      // Avoid a call to display::Screen::GetWindowAtScreenPoint() since it can
+      // be very expensive on X11 in cases when the tooltip is hidden anyway.
       if (tooltips_enabled_ &&
           !aura::Env::GetInstance()->IsMouseButtonDown() &&
           !IsDragDropInProgress()) {
         target = GetTooltipTarget(*event, &curr_mouse_loc_);
       }
       SetTooltipWindow(target);
       if (tooltip_timer_.IsRunning())
         tooltip_timer_.Reset();
 
       if (tooltip_->IsVisible())
@@ skipping 160 matching lines @@
     return;
   if (tooltip_window_)
     tooltip_window_->RemoveObserver(this);
   tooltip_window_ = target;
   if (tooltip_window_)
     tooltip_window_->AddObserver(this);
 }
 
 }  // namespace corewm
 }  // namespace views