chrome/browser/chromeos/extensions/wallpaper_manager_util.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/extensions/wallpaper_manager_util.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

« ash/wm/shelf_layout_manager.cc ('K') | « chrome/browser/chromeos/extensions/file_manager_util.cc ('k') | chrome/browser/chromeos/input_method/candidate_window.cc » ('j') | chrome/browser/notifications/balloon_collection_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/wallpaper_manager_util.cc

diff --git a/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc b/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc

index 01b92b031774b5d8839df6aa35072aec717c19af..a3bafd5c98025b6bb17828c7ed58b8310e46e892 100644

--- a/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc

+++ b/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc

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

#include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"

+#include "ash/shell.h"

#include "base/command_line.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/profiles/profile.h"

@@ -62,7 +63,8 @@ void OpenWallpaperManager() {

GURL wallpaper_picker_url(url);

int width = extension->launch_width();

int height = extension->launch_height();

oshima 2012/10/10 17:58:23 Hmm, this looks not exactly correct. Could you ple

scottmg 2012/10/10 19:04:47 Done.

- const gfx::Size screen = gfx::Screen::GetPrimaryDisplay().size();

+ const gfx::Size screen =

+ ash::Shell::GetAshScreen()->GetPrimaryDisplay().size();

const gfx::Rect bounds((screen.width() - width) / 2,

(screen.height() - height) / 2,

width,