ash/wm/workspace/workspace_event_handler_unittest.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: ash/wm/workspace/workspace_event_handler_unittest.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') | « ash/wm/workspace/workspace_event_handler.cc ('k') | ash/wm/workspace/workspace_manager2_unittest.cc » ('j') | chrome/browser/chromeos/extensions/wallpaper_manager_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/workspace/workspace_event_handler_unittest.cc

diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc

index 3a416647840dcffc0428adf482ab89ad7cb63699..03c69bf1d0ca29fef3fef7dccddcf6c5eafa78e5 100644

--- a/ash/wm/workspace/workspace_event_handler_unittest.cc

+++ b/ash/wm/workspace/workspace_event_handler_unittest.cc

@@ -50,8 +50,8 @@ TEST_F(WorkspaceEventHandlerTest, DoubleClickSingleAxisResizeEdge) {

wm::ActivateWindow(window.get());

- gfx::Rect work_area =

- gfx::Screen::GetDisplayNearestWindow(window.get()).work_area();

+ gfx::Rect work_area = Shell::GetAshScreen()->GetDisplayNearestWindow(

+ window.get()).work_area();

aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),

window.get());