Add context to gfx::Screen calls in support of simultaneous desktop+ash

ash/wm/system_modal_container_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/system_modal_container_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/system_modal_container_event_filter.h"
@@ skipping 56 matching lines @@
 SystemModalContainerLayoutManager::~SystemModalContainerLayoutManager() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SystemModalContainerLayoutManager, aura::LayoutManager implementation:
 
 void SystemModalContainerLayoutManager::OnWindowResized() {
   if (modal_background_) {
     // Note: we have to set the entire bounds with the screen offset.
     modal_background_->SetBounds(
-        gfx::Screen::GetDisplayNearestWindow(container_).bounds());
+        Shell::GetScreen()->GetDisplayNearestWindow(container_).bounds());
   }
   if (!modal_windows_.empty()) {
     aura::Window::Windows::iterator it = modal_windows_.begin();
     for (it = modal_windows_.begin(); it != modal_windows_.end(); ++it) {
       (*it)->SetBounds((*it)->bounds().AdjustToFit(container_->bounds()));
     }
   }
 }
 
 void SystemModalContainerLayoutManager::OnWindowAddedToLayout(
@@ skipping 71 matching lines @@
     return false;
   wm::ActivateWindow(modal_window());
   return true;
 }
 
 void SystemModalContainerLayoutManager::CreateModalBackground() {
   if (!modal_background_) {
     modal_background_ = new views::Widget;
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
     params.parent = container_;
-    params.bounds = gfx::Screen::GetDisplayNearestWindow(container_).bounds();
+    params.bounds = Shell::GetScreen()->GetDisplayNearestWindow(
+        container_).bounds();
     modal_background_->Init(params);
     modal_background_->GetNativeView()->SetName(
         "SystemModalContainerLayoutManager.ModalBackground");
     modal_background_->SetContentsView(new ModalBackgroundView);
     modal_background_->GetNativeView()->layer()->SetOpacity(0.0f);
   }
 
   ui::ScopedLayerAnimationSettings settings(
       modal_background_->GetNativeView()->layer()->GetAnimator());
   modal_background_->Show();
@@ skipping 47 matching lines @@
   aura::Window::Windows::iterator it =
       std::find(modal_windows_.begin(), modal_windows_.end(), window);
   if (it != modal_windows_.end())
     modal_windows_.erase(it);
 
   Shell::GetInstance()->OnModalWindowRemoved(window);
 }
 
 }  // namespace internal
 }  // namespace ash