ash/wm/workspace/workspace_event_handler.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.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/multi_window_resize_controller.cc ('k') | ash/wm/workspace/workspace_event_handler_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.cc

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

index 7504a1146581704fcb463ad6f5e503c035ffe7ad..f0db7261befd6a417c8d1c72356f6e8e6a986dee 100644

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

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

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

#include "ash/wm/workspace/workspace_event_handler.h"

#include "ash/screen_ash.h"

+#include "ash/shell.h"

#include "ash/wm/property_util.h"

#include "ash/wm/window_util.h"

#include "ash/wm/workspace/workspace_window_resizer.h"

@@ -141,7 +142,7 @@ void WorkspaceEventHandler::HandleVerticalResizeDoubleClick(

int component =

target->delegate()->GetNonClientComponent(event->location());

gfx::Rect work_area =

- gfx::Screen::GetDisplayNearestWindow(target).work_area();

+ Shell::GetAshScreen()->GetDisplayNearestWindow(target).work_area();

const gfx::Rect* restore_bounds =

target->GetProperty(aura::client::kRestoreBoundsKey);

if (component == HTBOTTOM || component == HTTOP) {