Remove ui/gfx/screen_type_delegate.h

ui/views/bubble/bubble_frame_view.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/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "build/build_config.h"
@@ skipping 352 matching lines @@
     }
   }
 
   // Calculate the bounds with the arrow in its updated location and offset.
   return bubble_border_->GetBounds(anchor_rect, size);
 }
 
 gfx::Rect BubbleFrameView::GetAvailableScreenBounds(
     const gfx::Rect& rect) const {
   // The bubble attempts to fit within the current screen bounds.
-  // TODO(scottmg): Native is wrong. http://crbug.com/133312
-  return gfx::Screen::GetNativeScreen()->GetDisplayNearestPoint(
-      rect.CenterPoint()).work_area();
+  return gfx::Screen::GetScreen()
+      ->GetDisplayNearestPoint(rect.CenterPoint())
+      .work_area();
 }
 
 bool BubbleFrameView::IsCloseButtonVisible() const {
   return close_->visible();
 }
 
 gfx::Rect BubbleFrameView::GetCloseButtonMirroredBounds() const {
   return close_->GetMirroredBounds();
 }
 
@@ skipping 81 matching lines @@
   if (titlebar_extra_view_ != NULL)
     title_bar_width += titlebar_extra_view_->GetPreferredSize().width();
   gfx::Size size(client_size);
   size.SetToMax(gfx::Size(title_bar_width, 0));
   const gfx::Insets insets(GetInsets());
   size.Enlarge(insets.width(), insets.height());
   return size;
 }
 
 }  // namespace views