| Index: chrome/browser/chromeos/drive/drive_integration_service.h
|
| diff --git a/chrome/browser/chromeos/drive/drive_integration_service.h b/chrome/browser/chromeos/drive/drive_integration_service.h
|
| index 8f6ad6d3920c98b9e3777092111e130fcc7b4132..3ba7c3dda441f197a54d8172213903714db8ac45 100644
|
| --- a/chrome/browser/chromeos/drive/drive_integration_service.h
|
| +++ b/chrome/browser/chromeos/drive/drive_integration_service.h
|
| @@ -83,10 +83,10 @@ class DriveIntegrationService : public KeyedService,
|
| const std::string& test_mount_point_name,
|
| const base::FilePath& test_cache_root,
|
| FileSystemInterface* test_file_system);
|
| - virtual ~DriveIntegrationService();
|
| + ~DriveIntegrationService() override;
|
|
|
| // KeyedService override:
|
| - virtual void Shutdown() override;
|
| + void Shutdown() override;
|
|
|
| void SetEnabled(bool enabled);
|
| bool is_enabled() const { return enabled_; }
|
| @@ -98,8 +98,8 @@ class DriveIntegrationService : public KeyedService,
|
| void RemoveObserver(DriveIntegrationServiceObserver* observer);
|
|
|
| // DriveNotificationObserver implementation.
|
| - virtual void OnNotificationReceived() override;
|
| - virtual void OnPushNotificationEnabled(bool enabled) override;
|
| + void OnNotificationReceived() override;
|
| + void OnPushNotificationEnabled(bool enabled) override;
|
|
|
| EventLogger* event_logger() { return logger_.get(); }
|
| DriveServiceInterface* drive_service() { return drive_service_.get(); }
|
| @@ -153,9 +153,9 @@ class DriveIntegrationService : public KeyedService,
|
| void AvoidDriveAsDownloadDirecotryPreference();
|
|
|
| // content::NotificationObserver overrides.
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override;
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override;
|
|
|
| friend class DriveIntegrationServiceFactory;
|
|
|
| @@ -222,12 +222,12 @@ class DriveIntegrationServiceFactory
|
| friend struct DefaultSingletonTraits<DriveIntegrationServiceFactory>;
|
|
|
| DriveIntegrationServiceFactory();
|
| - virtual ~DriveIntegrationServiceFactory();
|
| + ~DriveIntegrationServiceFactory() override;
|
|
|
| // BrowserContextKeyedServiceFactory overrides.
|
| - virtual content::BrowserContext* GetBrowserContextToUse(
|
| + content::BrowserContext* GetBrowserContextToUse(
|
| content::BrowserContext* context) const override;
|
| - virtual KeyedService* BuildServiceInstanceFor(
|
| + KeyedService* BuildServiceInstanceFor(
|
| content::BrowserContext* context) const override;
|
|
|
| // This is static so it can be set without instantiating the factory. This
|
|
|