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

ash/wm/workspace/workspace_layout_manager.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/wm/workspace/workspace_layout_manager.h"
 
 #include <algorithm>
 
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
@@ skipping 22 matching lines @@
 using aura::Window;
 
 namespace ash {
 
 WorkspaceLayoutManager::WorkspaceLayoutManager(aura::Window* window)
     : shelf_(NULL),
       window_(window),
       root_window_(window->GetRootWindow()),
       work_area_in_parent_(ScreenUtil::ConvertRectFromScreen(
           window_,
-          Shell::GetScreen()->GetDisplayNearestWindow(window_).work_area())),
-      is_fullscreen_(GetRootWindowController(
-          window->GetRootWindow())->GetWindowForFullscreenMode() != NULL) {
+          gfx::Screen::GetScreen()
+              ->GetDisplayNearestWindow(window_)
+              .work_area())),
+      is_fullscreen_(GetRootWindowController(window->GetRootWindow())
+                         ->GetWindowForFullscreenMode() != NULL) {
   Shell::GetInstance()->activation_client()->AddObserver(this);
   Shell::GetInstance()->AddShellObserver(this);
   root_window_->AddObserver(this);
   DCHECK(window->GetProperty(kSnapChildrenToPixelBoundary));
 }
 
 WorkspaceLayoutManager::~WorkspaceLayoutManager() {
   if (root_window_)
     root_window_->RemoveObserver(this);
   for (WindowSet::const_iterator i = windows_.begin(); i != windows_.end(); ++i)
@@ skipping 104 matching lines @@
     window_state->SetAndClearRestoreBounds();
   }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // WorkspaceLayoutManager, ash::ShellObserver implementation:
 
 void WorkspaceLayoutManager::OnDisplayWorkAreaInsetsChanged() {
   const gfx::Rect work_area(ScreenUtil::ConvertRectFromScreen(
       window_,
-      Shell::GetScreen()->GetDisplayNearestWindow(window_).work_area()));
+      gfx::Screen::GetScreen()->GetDisplayNearestWindow(window_).work_area()));
   if (work_area != work_area_in_parent_) {
     const wm::WMEvent event(wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED);
     AdjustAllWindowsBoundsForWorkAreaChange(&event);
   }
   if (backdrop_delegate_)
     backdrop_delegate_->OnDisplayWorkAreaInsetsChanged();
 }
 
 void WorkspaceLayoutManager::OnFullscreenStateChanged(
     bool is_fullscreen,
@@ skipping 117 matching lines @@
 //////////////////////////////////////////////////////////////////////////////
 // WorkspaceLayoutManager, private:
 
 void WorkspaceLayoutManager::AdjustAllWindowsBoundsForWorkAreaChange(
     const wm::WMEvent* event) {
   DCHECK(event->type() == wm::WM_EVENT_DISPLAY_BOUNDS_CHANGED ||
          event->type() == wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED);
 
   work_area_in_parent_ = ScreenUtil::ConvertRectFromScreen(
       window_,
-      Shell::GetScreen()->GetDisplayNearestWindow(window_).work_area());
+      gfx::Screen::GetScreen()->GetDisplayNearestWindow(window_).work_area());
 
   // Don't do any adjustments of the insets while we are in screen locked mode.
   // This would happen if the launcher was auto hidden before the login screen
   // was shown and then gets shown when the login screen gets presented.
   if (event->type() == wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED &&
       Shell::GetInstance()->session_state_delegate()->IsScreenLocked())
     return;
 
   // If a user plugs an external display into a laptop running Aura the
   // display size will change.  Maximized windows need to resize to match.
@@ skipping 23 matching lines @@
   bool is_fullscreen = GetRootWindowController(
       window_->GetRootWindow())->GetWindowForFullscreenMode() != NULL;
   if (is_fullscreen != is_fullscreen_) {
     ash::Shell::GetInstance()->NotifyFullscreenStateChange(
         is_fullscreen, window_->GetRootWindow());
     is_fullscreen_ = is_fullscreen;
   }
 }
 
 }  // namespace ash