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

Side by Side Diff: ash/system/chromeos/multi_user/user_switch_util_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/shell.h" 5 #include "ash/shell.h"
6 #include "ash/system/chromeos/multi_user/user_switch_util.h" 6 #include "ash/system/chromeos/multi_user/user_switch_util.h"
7 #include "ash/system/chromeos/screen_security/screen_tray_item.h" 7 #include "ash/system/chromeos/screen_security/screen_tray_item.h"
8 #include "ash/system/tray/system_tray.h" 8 #include "ash/system/tray/system_tray.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 10
11 namespace ash { 11 namespace ash {
12 12
13 class TrySwitchingUserTest : public ash::test::AshTestBase { 13 class TrySwitchingUserTest : public ash::test::AshTestBase {
14 public: 14 public:
15 // The action type to perform / check for upon user switching. 15 // The action type to perform / check for upon user switching.
16 enum ActionType { 16 enum ActionType {
17 NO_DIALOG, // No dialog should be shown. 17 NO_DIALOG, // No dialog should be shown.
18 ACCEPT_DIALOG, // A dialog should be shown and we should accept it. 18 ACCEPT_DIALOG, // A dialog should be shown and we should accept it.
19 DECLINE_DIALOG, // A dialog should be shown and we do not accept it. 19 DECLINE_DIALOG, // A dialog should be shown and we do not accept it.
20 }; 20 };
21 TrySwitchingUserTest() 21 TrySwitchingUserTest()
22 : capture_item_(NULL), 22 : capture_item_(NULL),
23 share_item_(NULL), 23 share_item_(NULL),
24 stop_capture_callback_hit_count_(0), 24 stop_capture_callback_hit_count_(0),
25 stop_share_callback_hit_count_(0), 25 stop_share_callback_hit_count_(0),
26 switch_callback_hit_count_(0) {} 26 switch_callback_hit_count_(0) {}
27 virtual ~TrySwitchingUserTest() {} 27 virtual ~TrySwitchingUserTest() {}
28 28
29 virtual void SetUp() OVERRIDE { 29 virtual void SetUp() override {
30 test::AshTestBase::SetUp(); 30 test::AshTestBase::SetUp();
31 TrayItemView::DisableAnimationsForTest(); 31 TrayItemView::DisableAnimationsForTest();
32 SystemTray* system_tray = Shell::GetInstance()->GetPrimarySystemTray(); 32 SystemTray* system_tray = Shell::GetInstance()->GetPrimarySystemTray();
33 share_item_ = system_tray->GetScreenShareItem(); 33 share_item_ = system_tray->GetScreenShareItem();
34 capture_item_ = system_tray->GetScreenCaptureItem(); 34 capture_item_ = system_tray->GetScreenCaptureItem();
35 EXPECT_TRUE(share_item_); 35 EXPECT_TRUE(share_item_);
36 EXPECT_TRUE(capture_item_); 36 EXPECT_TRUE(capture_item_);
37 } 37 }
38 38
39 // Accessing the capture session functionality. 39 // Accessing the capture session functionality.
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 EXPECT_EQ(1, stop_share_callback_hit_count()); 219 EXPECT_EQ(1, stop_share_callback_hit_count());
220 // Another stop should have no effect. 220 // Another stop should have no effect.
221 StopShareSession(); 221 StopShareSession();
222 StopCaptureSession(); 222 StopCaptureSession();
223 EXPECT_EQ(1, switch_callback_hit_count()); 223 EXPECT_EQ(1, switch_callback_hit_count());
224 EXPECT_EQ(1, stop_capture_callback_hit_count()); 224 EXPECT_EQ(1, stop_capture_callback_hit_count());
225 EXPECT_EQ(1, stop_share_callback_hit_count()); 225 EXPECT_EQ(1, stop_share_callback_hit_count());
226 } 226 }
227 227
228 } // namespace ash 228 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/multi_user/user_switch_util.cc ('k') | ash/system/chromeos/network/network_state_list_detailed_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698