ash/wm/drag_window_resizer_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/drag_window_resizer_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/drag_window_resizer_unittest.cc

diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc

index bef092c0c5dd72fa403c90ebfbd3471918848c72..f3c912469282cfcbf9d7ccf64a22eaca1881ffe5 100644

--- a/ash/wm/drag_window_resizer_unittest.cc

+++ b/ash/wm/drag_window_resizer_unittest.cc

@@ -6,12 +6,12 @@

#include "ash/display/mouse_cursor_event_filter.h"

#include "ash/root_window_controller.h"

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

#include "ash/shell.h"

#include "ash/shell_window_ids.h"

#include "ash/test/ash_test_base.h"

#include "ash/test/cursor_manager_test_api.h"

#include "ash/wm/drag_window_controller.h"

-#include "ash/wm/shelf_layout_manager.h"

#include "base/stringprintf.h"

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

#include "ui/aura/root_window.h"

@@ -98,7 +98,7 @@ class DragWindowResizerTest : public test::AshTestBase {

}

internal::ShelfLayoutManager* shelf_layout_manager() {

- return Shell::GetPrimaryRootWindowController()->shelf();

+ return Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();

}

static DragWindowResizer* CreateDragWindowResizer(

« no previous file with comments | « ash/wm/base_layout_manager.cc ('k') | ash/wm/gestures/shelf_gesture_handler.cc » ('j') | no next file with comments »