chrome/browser/chromeos/media/media_player.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/media/media_player.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix some new gfx::Screen additions Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/extensions/wallpaper_manager_util.cc ('K') | « chrome/browser/chromeos/login/webui_screen_locker.cc ('k') | chrome/browser/download/download_util.cc » ('j') | chrome/browser/notifications/balloon_collection_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/media/media_player.cc

diff --git a/chrome/browser/chromeos/media/media_player.cc b/chrome/browser/chromeos/media/media_player.cc

index 94576fa20ef9d270ac7948dc2299307bad44df5e..5647773698f850058dd791defb88f2167a30c666 100644

--- a/chrome/browser/chromeos/media/media_player.cc

+++ b/chrome/browser/chromeos/media/media_player.cc

@@ -6,6 +6,7 @@

#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"

@@ -119,7 +120,8 @@ void MediaPlayer::PopupMediaPlayer() {

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,