ash/wm/workspace/workspace_manager.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_manager.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_manager.cc

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

index 07a30086087d58db16d0fa71686c96520a31c8d7..bd70c98015661da0d087d1eca47395a417ae02a8 100644

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

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

@@ -20,8 +20,6 @@

#include "ui/aura/env.h"

#include "ui/aura/client/aura_constants.h"

#include "ui/aura/root_window.h"

-#include "ui/aura/monitor.h"

-#include "ui/aura/monitor_manager.h"

#include "ui/aura/window.h"

#include "ui/base/ui_base_types.h"

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

@@ -139,7 +137,8 @@ WorkspaceManager::WindowState WorkspaceManager::GetWindowState() {

return WINDOW_STATE_DEFAULT;

// TODO: this code needs to be made multi-monitor aware.

- gfx::Rect bounds(gfx::Screen::GetMonitorAreaNearestWindow(contents_view_));

+ gfx::Rect bounds(

+ gfx::Screen::GetMonitorNearestWindow(contents_view_).bounds());

bounds.set_height(bounds.height() - shelf_->shelf_height());

const aura::Window::Windows& windows(contents_view_->children());

bool window_overlaps_launcher = false;