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

Side by Side Diff: ui/views/corewm/capture_controller_unittest.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/wm/core/capture_controller.h" 5 #include "ui/wm/core/capture_controller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/aura/env.h" 8 #include "ui/aura/env.h"
9 #include "ui/aura/test/aura_test_base.h" 9 #include "ui/aura/test/aura_test_base.h"
10 #include "ui/aura/test/test_screen.h" 10 #include "ui/aura/test/test_screen.h"
(...skipping 12 matching lines...) Expand all
23 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 23 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
24 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h" 24 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
25 #endif 25 #endif
26 26
27 namespace views { 27 namespace views {
28 28
29 class CaptureControllerTest : public aura::test::AuraTestBase { 29 class CaptureControllerTest : public aura::test::AuraTestBase {
30 public: 30 public:
31 CaptureControllerTest() {} 31 CaptureControllerTest() {}
32 32
33 virtual void SetUp() OVERRIDE { 33 virtual void SetUp() override {
34 AuraTestBase::SetUp(); 34 AuraTestBase::SetUp();
35 capture_controller_.reset(new wm::ScopedCaptureClient(root_window())); 35 capture_controller_.reset(new wm::ScopedCaptureClient(root_window()));
36 36
37 second_host_.reset(aura::WindowTreeHost::Create(gfx::Rect(0, 0, 800, 600))); 37 second_host_.reset(aura::WindowTreeHost::Create(gfx::Rect(0, 0, 800, 600)));
38 second_host_->InitHost(); 38 second_host_->InitHost();
39 second_host_->window()->Show(); 39 second_host_->window()->Show();
40 second_host_->SetBounds(gfx::Rect(800, 600)); 40 second_host_->SetBounds(gfx::Rect(800, 600));
41 second_capture_controller_.reset( 41 second_capture_controller_.reset(
42 new wm::ScopedCaptureClient(second_host_->window())); 42 new wm::ScopedCaptureClient(second_host_->window()));
43 43
44 #if !defined(OS_CHROMEOS) 44 #if !defined(OS_CHROMEOS)
45 desktop_position_client_.reset( 45 desktop_position_client_.reset(
46 new DesktopScreenPositionClient(root_window())); 46 new DesktopScreenPositionClient(root_window()));
47 47
48 second_desktop_position_client_.reset( 48 second_desktop_position_client_.reset(
49 new DesktopScreenPositionClient(second_host_->window())); 49 new DesktopScreenPositionClient(second_host_->window()));
50 #endif 50 #endif
51 } 51 }
52 52
53 virtual void TearDown() OVERRIDE { 53 virtual void TearDown() override {
54 RunAllPendingInMessageLoop(); 54 RunAllPendingInMessageLoop();
55 55
56 #if !defined(OS_CHROMEOS) 56 #if !defined(OS_CHROMEOS)
57 second_desktop_position_client_.reset(); 57 second_desktop_position_client_.reset();
58 #endif 58 #endif
59 second_capture_controller_.reset(); 59 second_capture_controller_.reset();
60 60
61 // Kill any active compositors before we hit the compositor shutdown paths. 61 // Kill any active compositors before we hit the compositor shutdown paths.
62 second_host_.reset(); 62 second_host_.reset();
63 63
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 EXPECT_EQ(static_cast<aura::Window*>(NULL), GetCaptureWindow()); 159 EXPECT_EQ(static_cast<aura::Window*>(NULL), GetCaptureWindow());
160 EXPECT_EQ(static_cast<aura::Window*>(NULL), GetSecondCaptureWindow()); 160 EXPECT_EQ(static_cast<aura::Window*>(NULL), GetSecondCaptureWindow());
161 ui::TouchEvent touch_event( 161 ui::TouchEvent touch_event(
162 ui::ET_TOUCH_PRESSED, gfx::Point(), 0, 0, ui::EventTimeForNow(), 1.0f, 162 ui::ET_TOUCH_PRESSED, gfx::Point(), 0, 0, ui::EventTimeForNow(), 1.0f,
163 1.0f, 1.0f, 1.0f); 163 1.0f, 1.0f, 1.0f);
164 EXPECT_EQ(static_cast<ui::GestureConsumer*>(w2.get()), 164 EXPECT_EQ(static_cast<ui::GestureConsumer*>(w2.get()),
165 ui::GestureRecognizer::Get()->GetTouchLockedTarget(touch_event)); 165 ui::GestureRecognizer::Get()->GetTouchLockedTarget(touch_event));
166 } 166 }
167 167
168 } // namespace views 168 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/webview/webview_unittest.cc ('k') | ui/views/corewm/desktop_capture_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698