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

Side by Side Diff: ash/wm/workspace/multi_window_resize_controller_unittest.cc

Issue 10916221: Make ToplevelWindowEventFilter and WorkspaceEventFilter into event handlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller.cc ('k') | ash/wm/workspace/workspace2.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/workspace/multi_window_resize_controller.h" 5 #include "ash/wm/workspace/multi_window_resize_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "ash/wm/window_util.h" 9 #include "ash/wm/window_util.h"
10 #include "ash/wm/workspace_controller.h" 10 #include "ash/wm/workspace_controller.h"
11 #include "ash/wm/workspace_controller_test_helper.h" 11 #include "ash/wm/workspace_controller_test_helper.h"
12 #include "ash/wm/workspace/workspace_event_filter_test_helper.h" 12 #include "ash/wm/workspace/workspace_event_handler_test_helper.h"
13 #include "ash/wm/workspace/workspace_manager.h" 13 #include "ash/wm/workspace/workspace_manager.h"
14 #include "ui/aura/test/event_generator.h" 14 #include "ui/aura/test/event_generator.h"
15 #include "ui/aura/test/test_window_delegate.h" 15 #include "ui/aura/test/test_window_delegate.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/base/hit_test.h" 17 #include "ui/base/hit_test.h"
18 #include "ui/gfx/screen.h" 18 #include "ui/gfx/screen.h"
19 #include "ui/views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
20 20
21 namespace ash { 21 namespace ash {
22 namespace internal { 22 namespace internal {
23 23
24 class MultiWindowResizeControllerTest : public test::AshTestBase { 24 class MultiWindowResizeControllerTest : public test::AshTestBase {
25 public: 25 public:
26 MultiWindowResizeControllerTest() : resize_controller_(NULL) {} 26 MultiWindowResizeControllerTest() : resize_controller_(NULL) {}
27 virtual ~MultiWindowResizeControllerTest() {} 27 virtual ~MultiWindowResizeControllerTest() {}
28 28
29 virtual void SetUp() OVERRIDE { 29 virtual void SetUp() OVERRIDE {
30 test::AshTestBase::SetUp(); 30 test::AshTestBase::SetUp();
31 WorkspaceController* wc = 31 WorkspaceController* wc =
32 ash::Shell::TestApi(Shell::GetInstance()).workspace_controller(); 32 ash::Shell::TestApi(Shell::GetInstance()).workspace_controller();
33 WorkspaceEventFilter* event_filter = 33 WorkspaceEventHandler* event_handler =
34 WorkspaceControllerTestHelper(wc).GetFilter(); 34 WorkspaceControllerTestHelper(wc).GetEventHandler();
35 resize_controller_ = WorkspaceEventFilterTestHelper(event_filter). 35 resize_controller_ = WorkspaceEventHandlerTestHelper(event_handler).
36 resize_controller(); 36 resize_controller();
37 } 37 }
38 38
39 protected: 39 protected:
40 aura::Window* CreateTestWindow(aura::WindowDelegate* delegate, 40 aura::Window* CreateTestWindow(aura::WindowDelegate* delegate,
41 const gfx::Rect& bounds) { 41 const gfx::Rect& bounds) {
42 aura::Window* window = new aura::Window(delegate); 42 aura::Window* window = new aura::Window(delegate);
43 window->SetType(aura::client::WINDOW_TYPE_NORMAL); 43 window->SetType(aura::client::WINDOW_TYPE_NORMAL);
44 window->Init(ui::LAYER_TEXTURED); 44 window->Init(ui::LAYER_TEXTURED);
45 window->SetParent(NULL); 45 window->SetParent(NULL);
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 EXPECT_TRUE(HasTarget(w3.get())); 249 EXPECT_TRUE(HasTarget(w3.get()));
250 250
251 // Release the mouse. The resizer should still be visible and a subsequent 251 // Release the mouse. The resizer should still be visible and a subsequent
252 // press should not trigger a DCHECK. 252 // press should not trigger a DCHECK.
253 generator.ReleaseLeftButton(); 253 generator.ReleaseLeftButton();
254 EXPECT_TRUE(IsShowing()); 254 EXPECT_TRUE(IsShowing());
255 generator.PressLeftButton(); 255 generator.PressLeftButton();
256 } 256 }
257 } // namespace internal 257 } // namespace internal
258 } // namespace ash 258 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller.cc ('k') | ash/wm/workspace/workspace2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698