ash/wm/workspace/workspace_manager.cc - Issue 9696008: TestScreen shouldn't be marked aura export

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 9696008: TestScreen shouldn't be marked aura export (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase again. Created 8 years, 9 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 caf7d93ce440888d5683800c8df5881612df7dc4..1aaa8d0008cf1133752b00fb3e192045cd943a45 100644

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

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

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

#include <algorithm>

+#include "ash/screen_ash.h"

#include "ash/shell.h"

#include "ash/wm/property_util.h"

#include "ash/wm/shelf_layout_manager.h"

@@ -19,7 +20,6 @@

#include "base/stl_util.h"

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

#include "ui/aura/root_window.h"

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

#include "ui/aura/window.h"

#include "ui/base/ui_base_types.h"

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

@@ -288,7 +288,7 @@ void WorkspaceManager::SetActiveWorkspace(Workspace* workspace) {

gfx::Rect WorkspaceManager::GetWorkAreaBounds() {

gfx::Rect bounds(workspace_size_);

- bounds.Inset(Shell::GetRootWindow()->screen()->work_area_insets());

+ bounds.Inset(Shell::GetInstance()->screen()->work_area_insets());

return bounds;

}