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

ash/keyboard_overlay/keyboard_overlay_delegate.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/keyboard_overlay/keyboard_overlay_delegate.h"
 
 #include <algorithm>
 
+#include "ash/shell.h"
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/webview/web_dialog_view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 54 matching lines @@
 
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.delegate = view;
   widget->Init(params);
 
   // Show the widget at the bottom of the work area.
   gfx::Size size;
   GetDialogSize(&size);
-  const gfx::Rect& rect = gfx::Screen::GetDisplayNearestWindow(
+  const gfx::Rect& rect = ash::Shell::GetAshScreen()->GetDisplayNearestWindow(

[oshima, 2012/10/10 17:58:23]

this class should be in ash namespace. (confirmed with mazda)
Can you change the namespace instead?

[scottmg, 2012/10/10 19:04:47]

Done.

       widget->GetNativeView()).work_area();
   gfx::Rect bounds((rect.width() - size.width()) / 2,
                    rect.height() - size.height(),
                    size.width(),
                    size.height());
   widget->SetBounds(bounds);
 
   // The widget will be shown when the web contents gets ready to display.
 }
 
@@ skipping 11 matching lines @@
 
 void KeyboardOverlayDelegate::GetWebUIMessageHandlers(
     std::vector<WebUIMessageHandler*>* handlers) const {
   handlers->push_back(new PaintMessageHandler(view_->GetWidget()));
 }
 
 void KeyboardOverlayDelegate::GetDialogSize(
     gfx::Size* size) const {
   using std::min;
   DCHECK(view_);
-  gfx::Rect rect = gfx::Screen::GetDisplayNearestWindow(
+  gfx::Rect rect = ash::Shell::GetAshScreen()->GetDisplayNearestWindow(
       view_->GetWidget()->GetNativeView()).bounds();
   const int width = min(kBaseWidth, rect.width() - kHorizontalMargin);
   const int height = width * kBaseHeight / kBaseWidth;
   size->SetSize(width, height);
 }
 
 std::string KeyboardOverlayDelegate::GetDialogArgs() const {
   return "[]";
 }
 
 void KeyboardOverlayDelegate::OnDialogClosed(
     const std::string& json_retval) {
   delete this;
   return;
 }
 
 void KeyboardOverlayDelegate::OnCloseContents(WebContents* source,
                                               bool* out_close_dialog) {
 }
 
 bool KeyboardOverlayDelegate::ShouldShowDialogTitle() const {
   return false;
 }
 
 bool KeyboardOverlayDelegate::HandleContextMenu(
     const content::ContextMenuParams& params) {
   return true;
 }