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

ash/first_run/first_run_helper_impl.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/first_run/first_run_helper_impl.h"
 
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/logging.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/screen.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 views::Widget* CreateFirstRunWindow() {
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  params.bounds = Shell::GetScreen()->GetPrimaryDisplay().bounds();
+  params.bounds = gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds();
   params.show_state = ui::SHOW_STATE_FULLSCREEN;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.parent = Shell::GetContainer(Shell::GetPrimaryRootWindow(),
                                       ash::kShellWindowId_OverlayContainer);
   views::Widget* window = new views::Widget;
   window->Init(params);
   return window;
 }
 
 }  // anonymous namespace
@@ skipping 72 matching lines @@
   return bubble->GetBoundsInScreen();
 }
 
 gfx::Rect FirstRunHelperImpl::GetHelpButtonBounds() {
   SystemTray* tray = Shell::GetInstance()->GetPrimarySystemTray();
   views::View* help_button = tray->GetHelpButtonView();
   return help_button->GetBoundsInScreen();
 }
 
 }  // namespace ash