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

Side by Side Diff: chrome/browser/ui/views/profiles/profile_chooser_view_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 "chrome/browser/ui/views/profiles/profile_chooser_view.h" 5 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 18 matching lines...) Expand all
29 #include "components/signin/core/common/profile_management_switches.h" 29 #include "components/signin/core/common/profile_management_switches.h"
30 #include "content/public/test/test_utils.h" 30 #include "content/public/test/test_utils.h"
31 #include "ui/views/controls/button/label_button.h" 31 #include "ui/views/controls/button/label_button.h"
32 32
33 class ProfileChooserViewBrowserTest : public InProcessBrowserTest { 33 class ProfileChooserViewBrowserTest : public InProcessBrowserTest {
34 public: 34 public:
35 ProfileChooserViewBrowserTest(); 35 ProfileChooserViewBrowserTest();
36 virtual ~ProfileChooserViewBrowserTest(); 36 virtual ~ProfileChooserViewBrowserTest();
37 37
38 protected: 38 protected:
39 virtual void SetUp() OVERRIDE; 39 virtual void SetUp() override;
40 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; 40 virtual void SetUpCommandLine(CommandLine* command_line) override;
41 void OpenProfileChooserView(); 41 void OpenProfileChooserView();
42 42
43 private: 43 private:
44 DISALLOW_COPY_AND_ASSIGN(ProfileChooserViewBrowserTest); 44 DISALLOW_COPY_AND_ASSIGN(ProfileChooserViewBrowserTest);
45 }; 45 };
46 46
47 ProfileChooserViewBrowserTest::ProfileChooserViewBrowserTest() { 47 ProfileChooserViewBrowserTest::ProfileChooserViewBrowserTest() {
48 } 48 }
49 49
50 ProfileChooserViewBrowserTest::~ProfileChooserViewBrowserTest() { 50 ProfileChooserViewBrowserTest::~ProfileChooserViewBrowserTest() {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 return; 90 return;
91 91
92 Profile* profile = browser()->profile(); 92 Profile* profile = browser()->profile();
93 profile->GetPrefs()->SetInteger(prefs::kProfileAvatarTutorialShown, 0); 93 profile->GetPrefs()->SetInteger(prefs::kProfileAvatarTutorialShown, 0);
94 94
95 ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView()); 95 ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView());
96 96
97 histograms.ExpectUniqueSample("Profile.NewAvatarMenu.Upgrade", 97 histograms.ExpectUniqueSample("Profile.NewAvatarMenu.Upgrade",
98 ProfileMetrics::PROFILE_AVATAR_MENU_UPGRADE_VIEW, 1); 98 ProfileMetrics::PROFILE_AVATAR_MENU_UPGRADE_VIEW, 1);
99 } 99 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/profiles/profile_chooser_view.cc ('k') | chrome/browser/ui/views/profiles/profile_reset_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698