ash/wm/panels/panel_layout_manager_unittest.cc - Issue 12313118: Refactor: Shelf Widget

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/panels/panel_layout_manager_unittest.cc

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: safer shutdown (status_area_widget_) Created 7 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/panels/panel_layout_manager_unittest.cc

diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc

index a7a7a6ed6d9c2b7278c298ee06114204c057a1e8..137b49e233dab1f64062aa07def9e5b2bd6f5037 100644

--- a/ash/wm/panels/panel_layout_manager_unittest.cc

+++ b/ash/wm/panels/panel_layout_manager_unittest.cc

@@ -9,8 +9,10 @@

#include "ash/launcher/launcher_button.h"

#include "ash/launcher/launcher_model.h"

#include "ash/launcher/launcher_view.h"

+#include "ash/root_window_controller.h"

#include "ash/screen_ash.h"

-#include "ash/shelf_types.h"

+#include "ash/shelf/shelf_types.h"

+#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

#include "ash/shell_window_ids.h"

#include "ash/test/ash_test_base.h"

@@ -119,7 +121,8 @@ class PanelLayoutManagerTest : public test::AshTestBase {

ASSERT_FALSE(icon_bounds.IsEmpty());

gfx::Rect window_bounds = panel->GetBoundsInRootWindow();

- gfx::Rect launcher_bounds = launcher->widget()->GetWindowBoundsInScreen();

+ gfx::Rect launcher_bounds = launcher->shelf_widget()->

+ GetWindowBoundsInScreen();

ShelfAlignment alignment = GetAlignment();

if (IsHorizontal(alignment)) {

« no previous file with comments | « ash/wm/panels/panel_layout_manager.cc ('k') | ash/wm/panels/panel_window_resizer.cc » ('j') | no next file with comments »