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

Side by Side Diff: athena/wm/window_manager_unittest.cc

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "athena/wm/public/window_manager.h" 5 #include "athena/wm/public/window_manager.h"
6 6
7 #include "athena/screen/public/screen_manager.h" 7 #include "athena/screen/public/screen_manager.h"
8 #include "athena/test/base/athena_test_base.h" 8 #include "athena/test/base/athena_test_base.h"
9 #include "athena/test/base/test_windows.h" 9 #include "athena/test/base/test_windows.h"
10 #include "athena/wm/public/window_list_provider.h" 10 #include "athena/wm/public/window_list_provider.h"
11 #include "athena/wm/split_view_controller.h" 11 #include "athena/wm/split_view_controller.h"
12 #include "athena/wm/test/window_manager_impl_test_api.h" 12 #include "athena/wm/test/window_manager_impl_test_api.h"
13 #include "athena/wm/window_manager_impl.h" 13 #include "athena/wm/window_manager_impl.h"
14 #include "ui/aura/client/window_tree_client.h" 14 #include "ui/aura/client/window_tree_client.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/events/test/event_generator.h" 18 #include "ui/events/test/event_generator.h"
19 #include "ui/gfx/display.h" 19 #include "ui/gfx/display.h"
20 #include "ui/gfx/screen.h" 20 #include "ui/gfx/screen.h"
21 #include "ui/wm/core/window_util.h" 21 #include "ui/wm/core/window_util.h"
22 22
23 namespace athena { 23 namespace athena {
24 24
25 class WindowManagerTest : public test::AthenaTestBase { 25 class WindowManagerTest : public test::AthenaTestBase {
26 public: 26 public:
27 WindowManagerTest() {} 27 WindowManagerTest() {}
28 virtual ~WindowManagerTest() {} 28 ~WindowManagerTest() override {}
29 29
30 scoped_ptr<aura::Window> CreateAndActivateWindow( 30 scoped_ptr<aura::Window> CreateAndActivateWindow(
31 aura::WindowDelegate* delegate) { 31 aura::WindowDelegate* delegate) {
32 scoped_ptr<aura::Window> window(test::CreateNormalWindow(delegate, NULL)); 32 scoped_ptr<aura::Window> window(test::CreateNormalWindow(delegate, NULL));
33 window->Show(); 33 window->Show();
34 wm::ActivateWindow(window.get()); 34 wm::ActivateWindow(window.get());
35 return window.Pass(); 35 return window.Pass();
36 } 36 }
37 37
38 private: 38 private:
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 aura::test::TestWindowDelegate delegate; 386 aura::test::TestWindowDelegate delegate;
387 scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate)); 387 scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
388 WindowManager::Get()->EnterOverview(); 388 WindowManager::Get()->EnterOverview();
389 389
390 ui::test::EventGenerator generator(root_window()); 390 ui::test::EventGenerator generator(root_window());
391 generator.MoveMouseTo(1, 1); 391 generator.MoveMouseTo(1, 1);
392 generator.ClickLeftButton(); 392 generator.ClickLeftButton();
393 } 393 }
394 394
395 } // namespace athena 395 } // namespace athena
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698