Remove ui/gfx/screen_type_delegate.h

ui/views/corewm/tooltip_win.cc

 // Copyright 2013 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_win.h"
 
 #include <winuser.h>
 
 #include "base/debug/stack_trace.h"
 #include "base/i18n/rtl.h"
@@ skipping 59 matching lines @@
   }
 
   l10n_util::AdjustUIFontForWindow(tooltip_hwnd_);
 
   SendMessage(tooltip_hwnd_, TTM_ADDTOOL, 0,
               reinterpret_cast<LPARAM>(&toolinfo_));
   return true;
 }
 
 void TooltipWin::PositionTooltip() {
-  // This code only runs for non-metro, so GetNativeScreen() is fine.
   gfx::Point screen_point = gfx::win::DIPToScreenPoint(location_);
   const int cursoroffset = GetCurrentCursorVisibleHeight();
   screen_point.Offset(0, cursoroffset);
 
   DWORD tooltip_size = SendMessage(tooltip_hwnd_, TTM_GETBUBBLESIZE, 0,
                                    reinterpret_cast<LPARAM>(&toolinfo_));
   const gfx::Size size(LOWORD(tooltip_size), HIWORD(tooltip_size));
 
   const gfx::Display display(
-      gfx::Screen::GetNativeScreen()->GetDisplayNearestPoint(screen_point));
+      gfx::Screen::GetScreen()->GetDisplayNearestPoint(screen_point));
 
   gfx::Rect tooltip_bounds(screen_point, size);
   tooltip_bounds.AdjustToFit(gfx::win::DIPToScreenRect(display.work_area()));
   SetWindowPos(tooltip_hwnd_, NULL, tooltip_bounds.x(), tooltip_bounds.y(), 0,
                0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
 }
 
-int TooltipWin::GetMaxWidth(const gfx::Point& location,
-                            aura::Window* context) const {
-  // This code only runs for non-metro, so GetNativeScreen() is fine.
+int TooltipWin::GetMaxWidth(const gfx::Point& location) const {
   const gfx::Point screen_point = gfx::win::DIPToScreenPoint(location);
   gfx::Display display(
-      gfx::Screen::GetNativeScreen()->GetDisplayNearestPoint(screen_point));
+      gfx::Screen::GetScreen()->GetDisplayNearestPoint(screen_point));
   const gfx::Rect monitor_bounds = display.bounds();
   return (monitor_bounds.width() + 1) / 2;
 }
 
 void TooltipWin::SetText(aura::Window* window,
                          const base::string16& tooltip_text,
                          const gfx::Point& location) {
   if (!EnsureTooltipWindow())
     return;
 
   // See comment in header for details on why |location_| is needed.
   location_ = location;
 
   // Without this we get a flicker of the tooltip appearing at 0x0. Not sure
   // why.
   SetWindowPos(tooltip_hwnd_, NULL, 0, 0, 0, 0,
                SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE |
                SWP_NOREPOSITION | SWP_NOSIZE | SWP_NOZORDER);
 
   base::string16 adjusted_text(tooltip_text);
   base::i18n::AdjustStringForLocaleDirection(&adjusted_text);
   toolinfo_.lpszText = const_cast<WCHAR*>(adjusted_text.c_str());
   SendMessage(tooltip_hwnd_, TTM_SETTOOLINFO, 0,
               reinterpret_cast<LPARAM>(&toolinfo_));
 
-  int max_width = GetMaxWidth(location_, window);
+  int max_width = GetMaxWidth(location_);
   SendMessage(tooltip_hwnd_, TTM_SETMAXTIPWIDTH, 0, max_width);
 }
 
 void TooltipWin::Show() {
   if (!EnsureTooltipWindow())
     return;
 
   SendMessage(tooltip_hwnd_, TTM_TRACKACTIVATE,
               TRUE, reinterpret_cast<LPARAM>(&toolinfo_));
   SetWindowPos(tooltip_hwnd_, HWND_TOPMOST, 0, 0, 0, 0,
                SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOSIZE);
 }
 
 void TooltipWin::Hide() {
   if (!tooltip_hwnd_)
     return;
 
   SendMessage(tooltip_hwnd_, TTM_TRACKACTIVATE, FALSE,
               reinterpret_cast<LPARAM>(&toolinfo_));
 }
 
 bool TooltipWin::IsVisible() {
   return showing_;
 }
 
 }  // namespace corewm
 }  // namespace views