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

chrome/browser/chromeos/login/webui_screen_locker.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 "chrome/browser/chromeos/login/webui_screen_locker.h"
 
+#include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
@@ skipping 21 matching lines @@
 // WebUIScreenLocker implementation.
 
 WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker)
     : ScreenLockerDelegate(screen_locker),
       lock_ready_(false),
       webui_ready_(false) {
   set_should_emit_login_prompt_visible(false);
 }
 
 void WebUIScreenLocker::LockScreen(bool unlock_on_input) {
-  gfx::Rect bounds(gfx::Screen::GetPrimaryDisplay().bounds());
+  gfx::Rect bounds(ash::Shell::GetAshScreen()->GetPrimaryDisplay().bounds());
 
   lock_time_ = base::TimeTicks::Now();
   LockWindow* lock_window = LockWindow::Create();
   lock_window->set_observer(this);
   lock_window_ = lock_window->GetWidget();
   WebUILoginView::Init(lock_window_);
   lock_window_->SetContentsView(this);
   lock_window_->Show();
   OnWindowCreated();
   LoadURL(GURL(kLoginURL));
@@ skipping 142 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // LockWindow::Observer implementation:
 
 void WebUIScreenLocker::OnLockWindowReady() {
   lock_ready_ = true;
   if (webui_ready_)
     ScreenLockReady();
 }
 
 }  // namespace chromeos