Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

ash/shelf/overflow_bubble_view.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 "ash/shelf/overflow_bubble_view.h"
 
 #include <algorithm>
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_constants.h"
@@ skipping 93 matching lines @@
 
   DCHECK_GE(contents_size.width(), visible_bounds.width());
   int y = std::min(contents_size.height() - visible_bounds.height(),
                    std::max(0, scroll_offset_.y() + y_offset));
   scroll_offset_.set_y(y);
 }
 
 gfx::Size OverflowBubbleView::GetPreferredSize() const {
   gfx::Size preferred_size = GetContentsSize();
 
-  const gfx::Rect monitor_rect = Shell::GetScreen()->GetDisplayNearestPoint(
-      GetAnchorRect().CenterPoint()).work_area();
+  const gfx::Rect monitor_rect =
+      gfx::Screen::GetScreen()
+          ->GetDisplayNearestPoint(GetAnchorRect().CenterPoint())
+          .work_area();
   if (!monitor_rect.IsEmpty()) {
     if (IsHorizontalAlignment()) {
       preferred_size.set_width(std::min(
           preferred_size.width(),
           static_cast<int>(monitor_rect.width() *
                            kMaxBubbleSizeToScreenRatio)));
     } else {
       preferred_size.set_height(std::min(
           preferred_size.height(),
           static_cast<int>(monitor_rect.height() *
@@ skipping 61 matching lines @@
 
   const gfx::Size content_size = GetPreferredSize();
   border->set_arrow_offset(arrow_offset);
 
   const gfx::Rect anchor_rect = GetAnchorRect();
   gfx::Rect bubble_rect = GetBubbleFrameView()->GetUpdatedWindowBounds(
       anchor_rect,
       content_size,
       false);
 
-  gfx::Rect monitor_rect = Shell::GetScreen()->GetDisplayNearestPoint(
-      anchor_rect.CenterPoint()).work_area();
+  gfx::Rect monitor_rect =
+      gfx::Screen::GetScreen()
+          ->GetDisplayNearestPoint(anchor_rect.CenterPoint())
+          .work_area();
 
   int offset = 0;
   if (views::BubbleBorder::is_arrow_on_horizontal(arrow())) {
     if (bubble_rect.x() < monitor_rect.x())
       offset = monitor_rect.x() - bubble_rect.x();
     else if (bubble_rect.right() > monitor_rect.right())
       offset = monitor_rect.right() - bubble_rect.right();
 
     bubble_rect.Offset(offset, 0);
     border->set_arrow_offset(anchor_rect.CenterPoint().x() - bubble_rect.x());
   } else {
     if (bubble_rect.y() < monitor_rect.y())
       offset = monitor_rect.y() - bubble_rect.y();
     else if (bubble_rect.bottom() > monitor_rect.bottom())
       offset =  monitor_rect.bottom() - bubble_rect.bottom();
 
     bubble_rect.Offset(0, offset);
     border->set_arrow_offset(anchor_rect.CenterPoint().y() - bubble_rect.y());
   }
 
   GetBubbleFrameView()->SchedulePaint();
   return bubble_rect;
 }
 
 }  // namespace ash