Remove ui/gfx/screen_type_delegate.h

ui/views/corewm/tooltip_aura.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_aura.h"
 
 #include "base/macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "ui/aura/window.h"
@@ skipping 120 matching lines @@
 }
 
 TooltipAura::~TooltipAura() {
   DestroyWidget();
 }
 
 void TooltipAura::SetTooltipBounds(const gfx::Point& mouse_pos,
                                    const gfx::Size& tooltip_size) {
   gfx::Rect tooltip_rect(mouse_pos, tooltip_size);
   tooltip_rect.Offset(kCursorOffsetX, kCursorOffsetY);
-  gfx::Screen* screen = gfx::Screen::GetScreenFor(tooltip_window_);
+  gfx::Screen* screen = gfx::Screen::GetScreen();
   gfx::Rect display_bounds(screen->GetDisplayNearestPoint(mouse_pos).bounds());
 
   // If tooltip is out of bounds on the x axis, we simply shift it
   // horizontally by the offset.
   if (tooltip_rect.right() > display_bounds.right()) {
     int h_offset = tooltip_rect.right() - display_bounds.right();
     tooltip_rect.Offset(-h_offset, 0);
   }
 
   // If tooltip is out of bounds on the y axis, we flip it to appear above the
   // mouse cursor instead of below.
   if (tooltip_rect.bottom() > display_bounds.bottom())
     tooltip_rect.set_y(mouse_pos.y() - tooltip_size.height());
 
   tooltip_rect.AdjustToFit(display_bounds);
   widget_->SetBounds(tooltip_rect);
 }
 
 void TooltipAura::DestroyWidget() {
   if (widget_) {
     widget_->RemoveObserver(this);
     widget_->Close();
     widget_ = NULL;
   }
 }
 
-int TooltipAura::GetMaxWidth(const gfx::Point& location,
-                             aura::Window* context) const {
-  gfx::Screen* screen = gfx::Screen::GetScreenFor(context);
+int TooltipAura::GetMaxWidth(const gfx::Point& location) const {
+  gfx::Screen* screen = gfx::Screen::GetScreen();
   gfx::Rect display_bounds(screen->GetDisplayNearestPoint(location).bounds());
   return std::min(kTooltipMaxWidthPixels, (display_bounds.width() + 1) / 2);
 }
 
 void TooltipAura::SetText(aura::Window* window,
                           const base::string16& tooltip_text,
                           const gfx::Point& location) {
   tooltip_window_ = window;
-  tooltip_view_->SetMaxWidth(GetMaxWidth(location, window));
+  tooltip_view_->SetMaxWidth(GetMaxWidth(location));
   tooltip_view_->SetText(tooltip_text);
 
   if (!widget_) {
     widget_ = CreateTooltipWidget(tooltip_window_);
     widget_->SetContentsView(tooltip_view_.get());
     widget_->AddObserver(this);
   }
 
   SetTooltipBounds(location, tooltip_view_->GetPreferredSize());
 
@@ skipping 24 matching lines @@
 }
 
 void TooltipAura::OnWidgetDestroying(views::Widget* widget) {
   DCHECK_EQ(widget_, widget);
   widget_ = NULL;
   tooltip_window_ = NULL;
 }
 
 }  // namespace corewm
 }  // namespace views