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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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/test/shell_test_api.h" 9 #include "ash/test/shell_test_api.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
11 #include "ash/wm/workspace/workspace_event_handler_test_helper.h" 11 #include "ash/wm/workspace/workspace_event_handler_test_helper.h"
12 #include "ash/wm/workspace_controller.h" 12 #include "ash/wm/workspace_controller.h"
13 #include "ash/wm/workspace_controller_test_helper.h" 13 #include "ash/wm/workspace_controller_test_helper.h"
14 #include "ui/aura/test/test_window_delegate.h" 14 #include "ui/aura/test/test_window_delegate.h"
15 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
16 #include "ui/base/hit_test.h" 16 #include "ui/base/hit_test.h"
17 #include "ui/events/test/event_generator.h" 17 #include "ui/events/test/event_generator.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 22
23 class MultiWindowResizeControllerTest : public test::AshTestBase { 23 class MultiWindowResizeControllerTest : public test::AshTestBase {
24 public: 24 public:
25 MultiWindowResizeControllerTest() : resize_controller_(NULL) {} 25 MultiWindowResizeControllerTest() : resize_controller_(NULL) {}
26 virtual ~MultiWindowResizeControllerTest() {} 26 virtual ~MultiWindowResizeControllerTest() {}
27 27
28 virtual void SetUp() OVERRIDE { 28 virtual void SetUp() override {
29 test::AshTestBase::SetUp(); 29 test::AshTestBase::SetUp();
30 WorkspaceController* wc = 30 WorkspaceController* wc =
31 test::ShellTestApi(Shell::GetInstance()).workspace_controller(); 31 test::ShellTestApi(Shell::GetInstance()).workspace_controller();
32 WorkspaceEventHandler* event_handler = 32 WorkspaceEventHandler* event_handler =
33 WorkspaceControllerTestHelper(wc).GetEventHandler(); 33 WorkspaceControllerTestHelper(wc).GetEventHandler();
34 resize_controller_ = WorkspaceEventHandlerTestHelper(event_handler). 34 resize_controller_ = WorkspaceEventHandlerTestHelper(event_handler).
35 resize_controller(); 35 resize_controller();
36 } 36 }
37 37
38 protected: 38 protected:
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 EXPECT_TRUE(HasTarget(w3.get())); 248 EXPECT_TRUE(HasTarget(w3.get()));
249 249
250 // Release the mouse. The resizer should still be visible and a subsequent 250 // Release the mouse. The resizer should still be visible and a subsequent
251 // press should not trigger a DCHECK. 251 // press should not trigger a DCHECK.
252 generator.ReleaseLeftButton(); 252 generator.ReleaseLeftButton();
253 EXPECT_TRUE(IsShowing()); 253 EXPECT_TRUE(IsShowing());
254 generator.PressLeftButton(); 254 generator.PressLeftButton();
255 } 255 }
256 256
257 } // namespace ash 257 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller.cc ('k') | ash/wm/workspace/workspace_event_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698