Remove ui/gfx/screen_type_delegate.h

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"
@@ skipping 31 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::GetScreenFor(root_window);
+  gfx::Screen* screen = gfx::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 11 matching lines @@
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TooltipManagerAura, TooltipManager implementation:
 
 const gfx::FontList& TooltipManagerAura::GetFontList() const {
   return GetDefaultFontList();
 }
 
-int TooltipManagerAura::GetMaxWidth(const gfx::Point& point,
-                                    aura::Window* context) const {
-  return aura::client::GetTooltipClient(context->GetRootWindow())->
-      GetMaxWidth(point, context);
+int TooltipManagerAura::GetMaxWidth(const gfx::Point& point) const {
+  return aura::client::GetTooltipClient(GetWindow()->GetRootWindow())
+      ->GetMaxWidth(point);
 }
 
 void TooltipManagerAura::UpdateTooltip() {
   aura::Window* root_window = GetWindow()->GetRootWindow();
   if (aura::client::GetTooltipClient(root_window)) {
     if (!widget_->IsVisible()) {
       UpdateTooltipForTarget(NULL, gfx::Point(), root_window);
       return;
     }
     gfx::Point view_point =
@@ skipping 37 matching lines @@
       tooltip_text_ = new_tooltip_text;
   } else {
     tooltip_text_.clear();
   }
 
   aura::client::SetTooltipId(GetWindow(), target);
 
   aura::client::GetTooltipClient(root_window)->UpdateTooltip(GetWindow());
 }
 
-aura::Window* TooltipManagerAura::GetWindow() {
+aura::Window* TooltipManagerAura::GetWindow() const {
   return widget_->GetNativeView();
 }
 
 }  // namespace views.