ash/wm/workspace/workspace_event_filter.cc - Issue 9960042: Refactor screen/monitor so that gfx::Screen returns monitor object.

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_filter.cc

Issue 9960042: Refactor screen/monitor so that gfx::Screen returns monitor object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync Created 8 years, 8 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:

Index: ash/wm/workspace/workspace_event_filter.cc

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

index 2012a66a451c7d4970c97662921f3e17a4b1e2f0..07688342aa3e2c46cad4d41b0d6f573383c59f51 100644

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

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

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

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

-#include "ash/screen_ash.h"

#include "ash/wm/property_util.h"

#include "ash/wm/window_frame.h"

#include "ash/wm/window_util.h"

@@ -16,6 +15,7 @@

#include "ui/aura/window_delegate.h"

#include "ui/base/hit_test.h"

#include "ui/gfx/compositor/scoped_layer_animation_settings.h"

+#include "ui/gfx/screen.h"

namespace {

@@ -128,7 +128,7 @@ void WorkspaceEventFilter::HandleVerticalResizeDoubleClick(

int component =

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

gfx::Rect work_area =

- gfx::Screen::GetMonitorWorkAreaNearestWindow(target);

+ gfx::Screen::GetMonitorNearestWindow(target).work_area();

const gfx::Rect* restore_bounds =

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

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

« no previous file with comments | « ash/wm/workspace/snap_sizer.cc ('k') | ash/wm/workspace/workspace_event_filter_unittest.cc » ('j') | no next file with comments »