Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(483)

Issues Search
    My Issues | Starred     Open | Closed | All

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: formatting and moved a couple unit tests Created 7 years, 10 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:
View side-by-side diff with in-line comments
Download patch
« ash/shelf/shelf_layout_manager.cc ('K') | « ash/wm/base_layout_manager.cc ('k') | ash/wm/gestures/shelf_gesture_handler.cc » ('j') | ui/compositor/layer_animation_element.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d8688686caba723ab773c60335e28322fff28604..ad12c24e7248b052c706f947103a4d6f3796aab3 100644
--- a/ash/wm/drag_window_resizer_unittest.cc
+++ b/ash/wm/drag_window_resizer_unittest.cc
@@ -6,13 +6,13 @@
#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/cursor_manager.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"
@@ -99,7 +99,7 @@ class DragWindowResizerTest : public test::AshTestBase {
}
internal::ShelfLayoutManager* shelf_layout_manager() {
- return Shell::GetPrimaryRootWindowController()->shelf();
+ return Shell::GetPrimaryRootWindowController()->shelf_layout_manager();
}
static DragWindowResizer* CreateDragWindowResizer(
« ash/shelf/shelf_layout_manager.cc ('K') | « ash/wm/base_layout_manager.cc ('k') | ash/wm/gestures/shelf_gesture_handler.cc » ('j') | ui/compositor/layer_animation_element.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698