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

Side by Side Diff: ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc

Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Workaround Created 5 years, 11 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 "ash/system/chromeos/rotation/tray_rotation_lock.h" 5 #include "ash/system/chromeos/rotation/tray_rotation_lock.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/content/display/screen_orientation_controller_chromeos.h" 8 #include "ash/content/display/screen_orientation_controller_chromeos.h"
9 #include "ash/display/display_manager.h" 9 #include "ash/display/display_manager.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
(...skipping 10 matching lines...) Expand all
21 #include "base/time/time.h" 21 #include "base/time/time.h"
22 #include "ui/events/event.h" 22 #include "ui/events/event.h"
23 #include "ui/events/event_constants.h" 23 #include "ui/events/event_constants.h"
24 #include "ui/views/view.h" 24 #include "ui/views/view.h"
25 25
26 namespace ash { 26 namespace ash {
27 27
28 class TrayRotationLockTest : public test::AshTestBase { 28 class TrayRotationLockTest : public test::AshTestBase {
29 public: 29 public:
30 TrayRotationLockTest() {} 30 TrayRotationLockTest() {}
31 virtual ~TrayRotationLockTest() {} 31 ~TrayRotationLockTest() override {}
32 32
33 TrayRotationLock* tray() { 33 TrayRotationLock* tray() {
34 return tray_.get(); 34 return tray_.get();
35 } 35 }
36 36
37 views::View* tray_view() { 37 views::View* tray_view() {
38 return tray_view_.get(); 38 return tray_view_.get();
39 } 39 }
40 40
41 views::View* default_view() { 41 views::View* default_view() {
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 ui::GestureEvent tap( 216 ui::GestureEvent tap(
217 0, 0, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_TAP)); 217 0, 0, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_TAP));
218 default_view()->OnGestureEvent(&tap); 218 default_view()->OnGestureEvent(&tap);
219 EXPECT_TRUE(screen_orientation_controller->rotation_locked()); 219 EXPECT_TRUE(screen_orientation_controller->rotation_locked());
220 EXPECT_TRUE(tray_view()->visible()); 220 EXPECT_TRUE(tray_view()->visible());
221 221
222 maximize_mode_controller->EnableMaximizeModeWindowManager(false); 222 maximize_mode_controller->EnableMaximizeModeWindowManager(false);
223 } 223 }
224 224
225 } // namespace ash 225 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/power/video_activity_notifier.h ('k') | ash/system/chromeos/screen_security/screen_capture_tray_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698