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

chrome/browser/ui/views/extensions/extension_dialog.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/ui/views/extensions/extension_dialog.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/base_window.h"
@@ skipping 111 matching lines @@
   DCHECK(manager);
   if (!manager)
     return NULL;
   return manager->CreateDialogHost(url);
 }
 
 #if defined(USE_ASH)
 void ExtensionDialog::InitWindowFullscreen() {
   aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow();
   gfx::Rect screen_rect =
-      gfx::Screen::GetDisplayNearestWindow(root_window).bounds();
+      ash::Shell::GetAshScreen()->GetDisplayNearestWindow(root_window).bounds();
 
   // We want to be the fullscreen topmost child of the root window.
   window_ = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.delegate = this;
   params.parent = root_window;
   window_->Init(params);
   window_->StackAtTop();
   window_->SetBounds(screen_rect);
@@ skipping 14 matching lines @@
                                  int height) {
   gfx::NativeWindow parent = base_window->GetNativeWindow();
   window_ = views::Widget::CreateWindowWithParent(this, parent);
 
   // Center the window over the browser.
   gfx::Point center = base_window->GetBounds().CenterPoint();
   int x = center.x() - width / 2;
   int y = center.y() - height / 2;
   // Ensure the top left and top right of the window are on screen, with
   // priority given to the top left.
-  gfx::Rect screen_rect = gfx::Screen::GetDisplayNearestPoint(center).bounds();
+  gfx::Rect screen_rect = gfx::Screen::GetScreenFor(parent)->
+      GetDisplayNearestPoint(center).bounds();
   gfx::Rect bounds_rect = gfx::Rect(x, y, width, height);
   bounds_rect = bounds_rect.AdjustToFit(screen_rect);
   window_->SetBounds(bounds_rect);
 
   window_->Show();
   // TODO(jamescook): Remove redundant call to Activate()?
   window_->Activate();
 }
 
 void ExtensionDialog::ObserverDestroyed() {
@@ skipping 100 matching lines @@
       if (content::Details<extensions::ExtensionHost>(host()) != details)
         return;
       if (observer_)
         observer_->ExtensionTerminated(this);
       break;
     default:
       NOTREACHED() << L"Received unexpected notification";
       break;
   }
 }