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

ash/content/keyboard_overlay/keyboard_overlay_delegate.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 "ash/content/keyboard_overlay/keyboard_overlay_delegate.h"
 
 #include <algorithm>
 
 #include "ash/shell.h"
 #include "base/bind.h"
@@ skipping 59 matching lines @@
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.context = Shell::GetPrimaryRootWindow();
   params.delegate = view;
   widget_->Init(params);
 
   // Show the widget at the bottom of the work area.
   gfx::Size size;
   GetDialogSize(&size);
   const gfx::Rect& rect =
-      Shell::GetScreen()
+      gfx::Screen::GetScreen()
           ->GetDisplayNearestWindow(widget_->GetNativeView())
           .work_area();
   gfx::Rect bounds(rect.x() + (rect.width() - size.width()) / 2,
                    rect.bottom() - size.height(), size.width(), size.height());
   widget_->SetBounds(bounds);
 
   // The widget will be shown when the web contents gets ready to display.
   return widget_;
 }
 
@@ skipping 10 matching lines @@
 }
 
 void KeyboardOverlayDelegate::GetWebUIMessageHandlers(
     std::vector<WebUIMessageHandler*>* handlers) const {
   handlers->push_back(new PaintMessageHandler(widget_));
 }
 
 void KeyboardOverlayDelegate::GetDialogSize(gfx::Size* size) const {
   using std::min;
   DCHECK(widget_);
-  gfx::Rect rect = ash::Shell::GetScreen()
+  gfx::Rect rect = gfx::Screen::GetScreen()
                        ->GetDisplayNearestWindow(widget_->GetNativeView())
                        .work_area();
   const int width = min(kBaseWidth, rect.width() - kHorizontalMargin);
   const int height = width * kBaseHeight / kBaseWidth;
   size->SetSize(width, height);
 }
 
 std::string KeyboardOverlayDelegate::GetDialogArgs() const {
   return "[]";
 }
 
 void KeyboardOverlayDelegate::OnDialogClosed(const std::string& json_retval) {
   delete this;
   return;
 }
 
 void KeyboardOverlayDelegate::OnCloseContents(WebContents* source,
                                               bool* out_close_dialog) {}
 
 bool KeyboardOverlayDelegate::ShouldShowDialogTitle() const {
   return false;
 }
 
 bool KeyboardOverlayDelegate::HandleContextMenu(
     const content::ContextMenuParams& params) {
   return true;
 }
 
 }  // namespace ash