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

Unified Diff: ash/wm/workspace/workspace_event_filter_unittest.cc

Issue 10852003: Changes all non-workspace code to talk to WorkspaceManager via (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more constness Created 8 years, 4 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
« no previous file with comments | « ash/wm/shelf_layout_manager.cc ('k') | ash/wm/workspace/workspace_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_event_filter_unittest.cc
diff --git a/ash/wm/workspace/workspace_event_filter_unittest.cc b/ash/wm/workspace/workspace_event_filter_unittest.cc
index 3965e93b41b003364f007b88672cb09547a1b47c..9aafb1fb1b8a3e7e58d15f13df3d857f36a27da2 100644
--- a/ash/wm/workspace/workspace_event_filter_unittest.cc
+++ b/ash/wm/workspace/workspace_event_filter_unittest.cc
@@ -7,6 +7,7 @@
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/window_util.h"
+#include "ash/wm/workspace_controller_test_helper.h"
#include "ash/wm/workspace/workspace_manager.h"
#include "ash/wm/workspace_controller.h"
#include "ui/aura/test/event_generator.h"
@@ -40,9 +41,9 @@ class WorkspaceEventFilterTest : public test::AshTestBase {
};
TEST_F(WorkspaceEventFilterTest, DoubleClickSingleAxisResizeEdge) {
- Shell::TestApi shell_test(Shell::GetInstance());
- WorkspaceManager* manager =
- shell_test.workspace_controller()->workspace_manager();
+ WorkspaceControllerTestHelper workspace_helper(
+ Shell::TestApi(Shell::GetInstance()).workspace_controller());
+ WorkspaceManager* manager = workspace_helper.workspace_manager();
manager->set_grid_size(0);
// Double clicking the vertical resize edge of a window should maximize it
« no previous file with comments | « ash/wm/shelf_layout_manager.cc ('k') | ash/wm/workspace/workspace_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698