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

chrome/browser/chromeos/login/helper.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/helper.h"
 
+#include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/google/google_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
@@ skipping 33 matching lines @@
 }
 
 views::Throbber* CreateDefaultThrobber() {
   views::Throbber* throbber = new views::Throbber(kThrobberFrameMs, false);
   throbber->SetFrames(
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_SPINNER));
   return throbber;
 }
 
 gfx::Rect CalculateScreenBounds(const gfx::Size& size) {
-  gfx::Rect bounds(gfx::Screen::GetPrimaryDisplay().bounds());
+  gfx::Rect bounds(ash::Shell::GetAshScreen()->GetPrimaryDisplay().bounds());
   if (!size.IsEmpty()) {
     int horizontal_diff = bounds.width() - size.width();
     int vertical_diff = bounds.height() - size.height();
     bounds.Inset(horizontal_diff / 2, vertical_diff / 2);
   }
   return bounds;
 }
 
 void CorrectLabelFontSize(views::Label* label) {
   if (label)
@@ skipping 40 matching lines @@
   static const int kBaseUserImageSize = 220;
   float scale_factor = gfx::Display::GetForcedDeviceScaleFactor();
   if (scale_factor > 1.0f)
     return static_cast<int>(scale_factor * kBaseUserImageSize);
   // Use maximum supported scale factor.
   return kBaseUserImageSize *
       ui::GetScaleFactorScale(ui::GetSupportedScaleFactors().back());
 }
 
 }  // namespace chromeos