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

Side by Side Diff: chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/profiles/profile_manager.h" 9 #include "chrome/browser/profiles/profile_manager.h"
10 #include "chrome/browser/profiles/profiles_state.h" 10 #include "chrome/browser/profiles/profiles_state.h"
(...skipping 12 matching lines...) Expand all
23 #include "components/signin/core/common/profile_management_switches.h" 23 #include "components/signin/core/common/profile_management_switches.h"
24 #include "content/public/test/test_utils.h" 24 #include "content/public/test/test_utils.h"
25 #include "ui/views/controls/button/label_button.h" 25 #include "ui/views/controls/button/label_button.h"
26 26
27 class NewAvatarMenuButtonTest : public InProcessBrowserTest { 27 class NewAvatarMenuButtonTest : public InProcessBrowserTest {
28 public: 28 public:
29 NewAvatarMenuButtonTest(); 29 NewAvatarMenuButtonTest();
30 virtual ~NewAvatarMenuButtonTest(); 30 virtual ~NewAvatarMenuButtonTest();
31 31
32 protected: 32 protected:
33 virtual void SetUp() OVERRIDE; 33 virtual void SetUp() override;
34 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; 34 virtual void SetUpCommandLine(CommandLine* command_line) override;
35 void CreateTestingProfile(); 35 void CreateTestingProfile();
36 void StartAvatarMenu(); 36 void StartAvatarMenu();
37 37
38 private: 38 private:
39 DISALLOW_COPY_AND_ASSIGN(NewAvatarMenuButtonTest); 39 DISALLOW_COPY_AND_ASSIGN(NewAvatarMenuButtonTest);
40 }; 40 };
41 41
42 NewAvatarMenuButtonTest::NewAvatarMenuButtonTest() { 42 NewAvatarMenuButtonTest::NewAvatarMenuButtonTest() {
43 } 43 }
44 44
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 window_close_observer.Wait(); // Rely on test timeout for failure indication. 131 window_close_observer.Wait(); // Rely on test timeout for failure indication.
132 EXPECT_TRUE(browser_list->empty()); 132 EXPECT_TRUE(browser_list->empty());
133 133
134 // If the User Manager hasn't shown yet, wait for it to show up. 134 // If the User Manager hasn't shown yet, wait for it to show up.
135 if (!UserManager::IsShowing()) 135 if (!UserManager::IsShowing())
136 base::MessageLoop::current()->RunUntilIdle(); 136 base::MessageLoop::current()->RunUntilIdle();
137 137
138 // We need to hide the User Manager or else the process can't die. 138 // We need to hide the User Manager or else the process can't die.
139 UserManager::Hide(); 139 UserManager::Hide();
140 } 140 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/profiles/new_avatar_button.h ('k') | chrome/browser/ui/views/profiles/profile_chooser_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698