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

Side by Side Diff: ash/system/user/tray_user_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
« no previous file with comments | « ash/system/user/tray_user_separator.h ('k') | ash/system/user/user_card_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 <vector> 5 #include <vector>
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf_layout_manager.h" 8 #include "ash/shelf/shelf_layout_manager.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 10 matching lines...) Expand all
21 #include "ui/views/view.h" 21 #include "ui/views/view.h"
22 #include "ui/views/widget/widget.h" 22 #include "ui/views/widget/widget.h"
23 23
24 namespace ash { 24 namespace ash {
25 25
26 class TrayUserTest : public ash::test::AshTestBase { 26 class TrayUserTest : public ash::test::AshTestBase {
27 public: 27 public:
28 TrayUserTest(); 28 TrayUserTest();
29 29
30 // testing::Test: 30 // testing::Test:
31 virtual void SetUp() OVERRIDE; 31 virtual void SetUp() override;
32 32
33 // This has to be called prior to first use with the proper configuration. 33 // This has to be called prior to first use with the proper configuration.
34 void InitializeParameters(int users_logged_in, bool multiprofile); 34 void InitializeParameters(int users_logged_in, bool multiprofile);
35 35
36 // Show the system tray menu using the provided event generator. 36 // Show the system tray menu using the provided event generator.
37 void ShowTrayMenu(ui::test::EventGenerator* generator); 37 void ShowTrayMenu(ui::test::EventGenerator* generator);
38 38
39 // Move the mouse over the user item. 39 // Move the mouse over the user item.
40 void MoveOverUserItem(ui::test::EventGenerator* generator, int index); 40 void MoveOverUserItem(ui::test::EventGenerator* generator, int index);
41 41
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 EXPECT_EQ(active_user->GetUserID(), second_user->GetUserID()); 242 EXPECT_EQ(active_user->GetUserID(), second_user->GetUserID());
243 // Since the name is capitalized, the email should be different then the 243 // Since the name is capitalized, the email should be different then the
244 // user_id. 244 // user_id.
245 EXPECT_NE(active_user->GetUserID(), second_user->GetEmail()); 245 EXPECT_NE(active_user->GetUserID(), second_user->GetEmail());
246 tray()->CloseSystemBubble(); 246 tray()->CloseSystemBubble();
247 } 247 }
248 248
249 #endif 249 #endif
250 250
251 } // namespace ash 251 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/user/tray_user_separator.h ('k') | ash/system/user/user_card_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698