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

Side by Side Diff: chrome/browser/chromeos/profiles/profile_helper.h

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_
6 #define CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_ 6 #define CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 friend class extensions::ExtensionGarbageCollectorChromeOSUnitTest; 128 friend class extensions::ExtensionGarbageCollectorChromeOSUnitTest;
129 friend class FakeUserManager; 129 friend class FakeUserManager;
130 friend class KioskTest; 130 friend class KioskTest;
131 friend class MockUserManager; 131 friend class MockUserManager;
132 friend class MultiProfileUserControllerTest; 132 friend class MultiProfileUserControllerTest;
133 friend class ProfileHelperTest; 133 friend class ProfileHelperTest;
134 friend class ProfileListChromeOSTest; 134 friend class ProfileListChromeOSTest;
135 friend class SessionStateDelegateChromeOSTest; 135 friend class SessionStateDelegateChromeOSTest;
136 136
137 // BrowsingDataRemover::Observer implementation: 137 // BrowsingDataRemover::Observer implementation:
138 virtual void OnBrowsingDataRemoverDone() OVERRIDE; 138 virtual void OnBrowsingDataRemoverDone() override;
139 139
140 // OAuth2LoginManager::Observer overrides. 140 // OAuth2LoginManager::Observer overrides.
141 virtual void OnSessionRestoreStateChanged( 141 virtual void OnSessionRestoreStateChanged(
142 Profile* user_profile, 142 Profile* user_profile,
143 OAuth2LoginManager::SessionRestoreState state) OVERRIDE; 143 OAuth2LoginManager::SessionRestoreState state) override;
144 144
145 // user_manager::UserManager::UserSessionStateObserver implementation: 145 // user_manager::UserManager::UserSessionStateObserver implementation:
146 virtual void ActiveUserHashChanged(const std::string& hash) OVERRIDE; 146 virtual void ActiveUserHashChanged(const std::string& hash) override;
147 147
148 // Associates |user| with profile with the same user_id, 148 // Associates |user| with profile with the same user_id,
149 // for GetUserByProfile() testing. 149 // for GetUserByProfile() testing.
150 void SetProfileToUserMappingForTesting(user_manager::User* user); 150 void SetProfileToUserMappingForTesting(user_manager::User* user);
151 151
152 // Enables/disables testing code path in GetUserByProfile() like 152 // Enables/disables testing code path in GetUserByProfile() like
153 // always return primary user (when always_return_primary_user_for_testing is 153 // always return primary user (when always_return_primary_user_for_testing is
154 // set). 154 // set).
155 static void SetProfileToUserForTestingEnabled(bool enabled); 155 static void SetProfileToUserForTestingEnabled(bool enabled);
156 156
(...skipping 29 matching lines...) Expand all
186 // If true and enable_profile_to_user_testing is true then primary user will 186 // If true and enable_profile_to_user_testing is true then primary user will
187 // always be returned by GetUserByProfile(). 187 // always be returned by GetUserByProfile().
188 static bool always_return_primary_user_for_testing; 188 static bool always_return_primary_user_for_testing;
189 189
190 DISALLOW_COPY_AND_ASSIGN(ProfileHelper); 190 DISALLOW_COPY_AND_ASSIGN(ProfileHelper);
191 }; 191 };
192 192
193 } // namespace chromeos 193 } // namespace chromeos
194 194
195 #endif // CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_ 195 #endif // CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698