chrome/browser/chromeos/login/webui_screen_locker.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/login/webui_screen_locker.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/helper.cc ('k') | chrome/browser/chromeos/media/media_player.cc » ('j') | chrome/browser/notifications/balloon_collection_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/webui_screen_locker.cc

diff --git a/chrome/browser/chromeos/login/webui_screen_locker.cc b/chrome/browser/chromeos/login/webui_screen_locker.cc

index 4a3824db62637bc2c44360d238f19f185f540de1..511f3ef6c2a53547e53f59f1d0705b8251ea02b7 100644

--- a/chrome/browser/chromeos/login/webui_screen_locker.cc

+++ b/chrome/browser/chromeos/login/webui_screen_locker.cc

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

#include "chrome/browser/chromeos/login/webui_screen_locker.h"

+#include "ash/shell.h"

#include "base/command_line.h"

#include "base/metrics/histogram.h"

#include "base/utf_string_conversions.h"

@@ -45,7 +46,7 @@ WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker)

}

void WebUIScreenLocker::LockScreen(bool unlock_on_input) {

- gfx::Rect bounds(gfx::Screen::GetPrimaryDisplay().bounds());

+ gfx::Rect bounds(ash::Shell::GetAshScreen()->GetPrimaryDisplay().bounds());

lock_time_ = base::TimeTicks::Now();

LockWindow* lock_window = LockWindow::Create();