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

Side by Side Diff: ash/system/chromeos/rotation/tray_rotation_lock_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 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/display/display_manager.h" 8 #include "ash/display/display_manager.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/shelf/shelf_widget.h" 10 #include "ash/shelf/shelf_widget.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 // created. On a secondary display both the tray view and default view will 46 // created. On a secondary display both the tray view and default view will
47 // be null. 47 // be null.
48 void SetUpForStatusAreaWidget(StatusAreaWidget* status_area_widget); 48 void SetUpForStatusAreaWidget(StatusAreaWidget* status_area_widget);
49 49
50 // Resets |tray_| |tray_view_| and |default_view_| so that all components of 50 // Resets |tray_| |tray_view_| and |default_view_| so that all components of
51 // TrayRotationLock have been cleared. Tests may then call 51 // TrayRotationLock have been cleared. Tests may then call
52 // SetUpForStatusAreaWidget in order to initial the components. 52 // SetUpForStatusAreaWidget in order to initial the components.
53 void TearDownViews(); 53 void TearDownViews();
54 54
55 // test::AshTestBase: 55 // test::AshTestBase:
56 virtual void SetUp() OVERRIDE; 56 virtual void SetUp() override;
57 virtual void TearDown() OVERRIDE; 57 virtual void TearDown() override;
58 58
59 private: 59 private:
60 scoped_ptr<TrayRotationLock> tray_; 60 scoped_ptr<TrayRotationLock> tray_;
61 scoped_ptr<views::View> tray_view_; 61 scoped_ptr<views::View> tray_view_;
62 scoped_ptr<views::View> default_view_; 62 scoped_ptr<views::View> default_view_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(TrayRotationLockTest); 64 DISALLOW_COPY_AND_ASSIGN(TrayRotationLockTest);
65 }; 65 };
66 66
67 void TrayRotationLockTest::SetUpForStatusAreaWidget( 67 void TrayRotationLockTest::SetUpForStatusAreaWidget(
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 0, 0, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_TAP)); 213 0, 0, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_TAP));
214 default_view()->OnGestureEvent(&tap); 214 default_view()->OnGestureEvent(&tap);
215 EXPECT_TRUE(maximize_mode_controller->rotation_locked()); 215 EXPECT_TRUE(maximize_mode_controller->rotation_locked());
216 EXPECT_TRUE(tray_view()->visible()); 216 EXPECT_TRUE(tray_view()->visible());
217 217
218 Shell::GetInstance()->maximize_mode_controller()-> 218 Shell::GetInstance()->maximize_mode_controller()->
219 EnableMaximizeModeWindowManager(false); 219 EnableMaximizeModeWindowManager(false);
220 } 220 }
221 221
222 } // namespace ash 222 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/rotation/tray_rotation_lock.cc ('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