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

Unified Diff: chrome/browser/chromeos/settings/device_settings_test_helper.h

Issue 851123003: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/settings/device_settings_test_helper.h
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
index 74a198f925cf8ab1dd1dae37062b07d96b8b3fc0..05c6be267d78f8d0528b44f364ef0188cdc9079c 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
@@ -40,7 +40,7 @@ class DeviceSettingsTestHelper : public SessionManagerClient {
public:
// Wraps a device settings service instance for testing.
DeviceSettingsTestHelper();
- virtual ~DeviceSettingsTestHelper();
+ ~DeviceSettingsTestHelper() override;
// Runs all pending store callbacks.
void FlushStore();
@@ -82,49 +82,43 @@ class DeviceSettingsTestHelper : public SessionManagerClient {
}
// SessionManagerClient:
- virtual void Init(dbus::Bus* bus) override;
- virtual void SetStubDelegate(SessionManagerClient::StubDelegate* delegate)
- override;
- virtual void AddObserver(Observer* observer) override;
- virtual void RemoveObserver(Observer* observer) override;
- virtual bool HasObserver(const Observer* observer) const override;
- virtual bool IsScreenLocked() const override;
- virtual void EmitLoginPromptVisible() override;
- virtual void RestartJob(int pid, const std::string& command_line) override;
- virtual void StartSession(const std::string& user_email) override;
- virtual void StopSession() override;
- virtual void NotifySupervisedUserCreationStarted() override;
- virtual void NotifySupervisedUserCreationFinished() override;
- virtual void StartDeviceWipe() override;
- virtual void RequestLockScreen() override;
- virtual void NotifyLockScreenShown() override;
- virtual void NotifyLockScreenDismissed() override;
- virtual void RetrieveActiveSessions(
- const ActiveSessionsCallback& callback) override;
- virtual void RetrieveDevicePolicy(
- const RetrievePolicyCallback& callback) override;
- virtual void RetrievePolicyForUser(
- const std::string& username,
- const RetrievePolicyCallback& callback) override;
- virtual std::string BlockingRetrievePolicyForUser(
+ void Init(dbus::Bus* bus) override;
+ void SetStubDelegate(SessionManagerClient::StubDelegate* delegate) override;
+ void AddObserver(Observer* observer) override;
+ void RemoveObserver(Observer* observer) override;
+ bool HasObserver(const Observer* observer) const override;
+ bool IsScreenLocked() const override;
+ void EmitLoginPromptVisible() override;
+ void RestartJob(int pid, const std::string& command_line) override;
+ void StartSession(const std::string& user_email) override;
+ void StopSession() override;
+ void NotifySupervisedUserCreationStarted() override;
+ void NotifySupervisedUserCreationFinished() override;
+ void StartDeviceWipe() override;
+ void RequestLockScreen() override;
+ void NotifyLockScreenShown() override;
+ void NotifyLockScreenDismissed() override;
+ void RetrieveActiveSessions(const ActiveSessionsCallback& callback) override;
+ void RetrieveDevicePolicy(const RetrievePolicyCallback& callback) override;
+ void RetrievePolicyForUser(const std::string& username,
+ const RetrievePolicyCallback& callback) override;
+ std::string BlockingRetrievePolicyForUser(
const std::string& username) override;
- virtual void RetrieveDeviceLocalAccountPolicy(
+ void RetrieveDeviceLocalAccountPolicy(
const std::string& account_id,
const RetrievePolicyCallback& callback) override;
- virtual void StoreDevicePolicy(const std::string& policy_blob,
- const StorePolicyCallback& callback) override;
- virtual void StorePolicyForUser(const std::string& username,
- const std::string& policy_blob,
- const StorePolicyCallback& callback) override;
- virtual void StoreDeviceLocalAccountPolicy(
+ void StoreDevicePolicy(const std::string& policy_blob,
+ const StorePolicyCallback& callback) override;
+ void StorePolicyForUser(const std::string& username,
+ const std::string& policy_blob,
+ const StorePolicyCallback& callback) override;
+ void StoreDeviceLocalAccountPolicy(
const std::string& account_id,
const std::string& policy_blob,
const StorePolicyCallback& callback) override;
- virtual void SetFlagsForUser(
- const std::string& account_id,
- const std::vector<std::string>& flags) override;
- virtual void GetServerBackedStateKeys(
- const StateKeysCallback& callback) override;
+ void SetFlagsForUser(const std::string& account_id,
+ const std::vector<std::string>& flags) override;
+ void GetServerBackedStateKeys(const StateKeysCallback& callback) override;
private:
struct PolicyState {
@@ -152,7 +146,7 @@ class DeviceSettingsTestHelper : public SessionManagerClient {
class ScopedDeviceSettingsTestHelper : public DeviceSettingsTestHelper {
public:
ScopedDeviceSettingsTestHelper();
- virtual ~ScopedDeviceSettingsTestHelper();
+ ~ScopedDeviceSettingsTestHelper() override;
private:
DISALLOW_COPY_AND_ASSIGN(ScopedDeviceSettingsTestHelper);
@@ -165,10 +159,10 @@ class ScopedDeviceSettingsTestHelper : public DeviceSettingsTestHelper {
class DeviceSettingsTestBase : public testing::Test {
protected:
DeviceSettingsTestBase();
- virtual ~DeviceSettingsTestBase();
+ ~DeviceSettingsTestBase() override;
- virtual void SetUp() override;
- virtual void TearDown() override;
+ void SetUp() override;
+ void TearDown() override;
// Flushes any pending device settings operations.
void FlushDeviceSettings();

Powered by Google App Engine
This is Rietveld 408576698