ash/wm/workspace/workspace_layout_manager2_unittest.cc - Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher()

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

Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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:

Index: ash/wm/workspace/workspace_layout_manager2_unittest.cc

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

index b5b8abd4dc2cb31842dcc64b8f74f8eced9504ad..799e013328995855c01eaaf2f7f8b6b3178fc69a 100644

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

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

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

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

+#include "ash/root_window_controller.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "ash/wm/property_util.h"

@@ -65,7 +66,8 @@ class DontClobberRestoreBoundsWindowObserver : public aura::WindowObserver {

aura::Window* w = window_;

window_ = NULL;

- gfx::Rect shelf_bounds(Shell::GetInstance()->shelf()->GetIdealBounds());

+ gfx::Rect shelf_bounds(

+ Shell::GetPrimaryRootWindowController()->shelf()->GetIdealBounds());

const gfx::Rect& window_bounds(w->bounds());

w->SetBounds(gfx::Rect(window_bounds.x(), shelf_bounds.y() - 1,

window_bounds.width(), window_bounds.height()));