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

chrome/browser/chromeos/media/media_player.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/media/media_player.h"
 
 #include <string>
 
+#include "ash/shell.h"
 #include "base/bind.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 93 matching lines @@
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&MediaPlayer::PopupMediaPlayer,
                    base::Unretained(this) /*this class is a singleton*/));
     return;
   }
 
   Browser* browser = GetBrowser();
   if (!browser) {
-    const gfx::Size screen = gfx::Screen::GetPrimaryDisplay().size();
+    const gfx::Size screen =
+        ash::Shell::GetAshScreen()->GetPrimaryDisplay().size();
     const gfx::Rect bounds(screen.width() - kPopupRight - kPopupWidth,
                            screen.height() - kPopupBottom - kPopupHeight,
                            kPopupWidth,
                            kPopupHeight);
 
     Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
     browser = new Browser(
         Browser::CreateParams::CreateForApp(Browser::TYPE_PANEL,
                                             kMediaPlayerAppName,
                                             bounds,
@@ skipping 22 matching lines @@
       if (base_url == GetMediaPlayerUrl())
         return browser;
     }
   }
   return NULL;
 }
 
 MediaPlayer::MediaPlayer()
     : current_position_(0) {
 };