diff options
| author | mostynb <mostynb@opera.com> | 2014-10-03 16:46:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-03 23:46:36 +0000 |
| commit | 9108efb932b3ea03c02594cde0b80341a616f501 (patch) | |
| tree | 10d0095abc0ad4caa091fa2c01a1dc89e412b1fa /chrome/browser | |
| parent | ae1244a85d8f761a2c4c3812cfb6b8112ea08afb (diff) | |
| download | chromium_src-9108efb932b3ea03c02594cde0b80341a616f501.zip chromium_src-9108efb932b3ea03c02594cde0b80341a616f501.tar.gz chromium_src-9108efb932b3ea03c02594cde0b80341a616f501.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/
BUG=417463
Review URL: https://codereview.chromium.org/623293003
Cr-Commit-Position: refs/heads/master@{#298120}
Diffstat (limited to 'chrome/browser')
565 files changed, 2818 insertions, 2817 deletions
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.h b/chrome/browser/chromeos/accessibility/accessibility_manager.h index 56f962b..23872cf 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager.h +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.h @@ -162,7 +162,7 @@ class AccessibilityManager bool IsBrailleDisplayConnected() const; // SessionStateObserver overrides: - virtual void ActiveUserChanged(const std::string& user_id) OVERRIDE; + virtual void ActiveUserChanged(const std::string& user_id) override; void SetProfileForTest(Profile* profile); @@ -228,19 +228,19 @@ class AccessibilityManager // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // extensions::api::braille_display_private::BrailleObserver implementation. // Enables spoken feedback if a braille display becomes available. virtual void OnBrailleDisplayStateChanged( const extensions::api::braille_display_private::DisplayState& - display_state) OVERRIDE; + display_state) override; virtual void OnBrailleKeyEvent( - const extensions::api::braille_display_private::KeyEvent& event) OVERRIDE; + const extensions::api::braille_display_private::KeyEvent& event) override; // InputMethodManager::Observer virtual void InputMethodChanged(input_method::InputMethodManager* manager, - bool show_message) OVERRIDE; + bool show_message) override; // Profile which has the current a11y context. diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc index c29e685..db755aa 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc @@ -226,24 +226,24 @@ class AccessibilityManagerTest : public InProcessBrowserTest { AccessibilityManagerTest() : default_autoclick_delay_(0) {} virtual ~AccessibilityManagerTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kLoginManager); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, TestingProfile::kTestUserProfileDir); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { AccessibilityManager::SetBrailleControllerForTest(&braille_controller_); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { // Sets the login-screen profile. AccessibilityManager::Get()-> SetProfileForTest(ProfileHelper::GetSigninProfile()); default_autoclick_delay_ = GetAutoclickDelay(); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { AccessibilityManager::SetBrailleControllerForTest(NULL); } diff --git a/chrome/browser/chromeos/accessibility/magnification_manager.cc b/chrome/browser/chromeos/accessibility/magnification_manager.cc index 8f47444..801d021d 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager.cc @@ -64,15 +64,15 @@ class MagnificationManagerImpl : public MagnificationManager, } // MagnificationManager implimentation: - virtual bool IsMagnifierEnabled() const OVERRIDE { + virtual bool IsMagnifierEnabled() const override { return enabled_; } - virtual ash::MagnifierType GetMagnifierType() const OVERRIDE { + virtual ash::MagnifierType GetMagnifierType() const override { return type_; } - virtual void SetMagnifierEnabled(bool enabled) OVERRIDE { + virtual void SetMagnifierEnabled(bool enabled) override { if (!profile_) return; @@ -81,7 +81,7 @@ class MagnificationManagerImpl : public MagnificationManager, prefs->CommitPendingWrite(); } - virtual void SetMagnifierType(ash::MagnifierType type) OVERRIDE { + virtual void SetMagnifierType(ash::MagnifierType type) override { if (!profile_) return; @@ -90,7 +90,7 @@ class MagnificationManagerImpl : public MagnificationManager, prefs->CommitPendingWrite(); } - virtual void SaveScreenMagnifierScale(double scale) OVERRIDE { + virtual void SaveScreenMagnifierScale(double scale) override { if (!profile_) return; @@ -98,7 +98,7 @@ class MagnificationManagerImpl : public MagnificationManager, scale); } - virtual double GetSavedScreenMagnifierScale() const OVERRIDE { + virtual double GetSavedScreenMagnifierScale() const override { if (!profile_) return std::numeric_limits<double>::min(); @@ -106,12 +106,12 @@ class MagnificationManagerImpl : public MagnificationManager, prefs::kAccessibilityScreenMagnifierScale); } - virtual void SetProfileForTest(Profile* profile) OVERRIDE { + virtual void SetProfileForTest(Profile* profile) override { SetProfile(profile); } // SessionStateObserver overrides: - virtual void ActiveUserChanged(const std::string& user_id) OVERRIDE { + virtual void ActiveUserChanged(const std::string& user_id) override { SetProfile(ProfileManager::GetActiveUserProfile()); } @@ -216,7 +216,7 @@ class MagnificationManagerImpl : public MagnificationManager, // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { switch (type) { case chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE: { // Update |profile_| when entering the login screen. diff --git a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc index 719a633..c27f056 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc @@ -152,13 +152,13 @@ class MagnificationManagerTest : public InProcessBrowserTest { MagnificationManagerTest() {} virtual ~MagnificationManagerTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kLoginManager); command_line->AppendSwitchASCII(switches::kLoginProfile, TestingProfile::kTestUserProfileDir); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { // Set the login-screen profile. MagnificationManager::Get()->SetProfileForTest( ProfileManager::GetActiveUserProfile()); diff --git a/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc b/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc index 02f07e3..50a83ca 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc @@ -41,14 +41,14 @@ class MagnificationManagerTest : public ash::test::AshTestBase { MagnificationManagerTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ash::test::AshTestBase::SetUp(); MagnificationManager::Initialize(); ASSERT_TRUE(MagnificationManager::Get()); MagnificationManager::Get()->SetProfileForTest(&profile_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { MagnificationManager::Shutdown(); ash::test::AshTestBase::TearDown(); } diff --git a/chrome/browser/chromeos/accessibility/speech_monitor.h b/chrome/browser/chromeos/accessibility/speech_monitor.h index 2575dc3..f874661 100644 --- a/chrome/browser/chromeos/accessibility/speech_monitor.h +++ b/chrome/browser/chromeos/accessibility/speech_monitor.h @@ -29,23 +29,23 @@ class SpeechMonitor : public TtsPlatformImpl { bool SkipChromeVoxEnabledMessage(); // TtsPlatformImpl implementation. - virtual bool PlatformImplAvailable() OVERRIDE; + virtual bool PlatformImplAvailable() override; virtual bool Speak( int utterance_id, const std::string& utterance, const std::string& lang, const VoiceData& voice, - const UtteranceContinuousParameters& params) OVERRIDE; - virtual bool StopSpeaking() OVERRIDE; - virtual bool IsSpeaking() OVERRIDE; - virtual void GetVoices(std::vector<VoiceData>* out_voices) OVERRIDE; - virtual void Pause() OVERRIDE {} - virtual void Resume() OVERRIDE {} - virtual std::string error() OVERRIDE; - virtual void clear_error() OVERRIDE {} - virtual void set_error(const std::string& error) OVERRIDE {} + const UtteranceContinuousParameters& params) override; + virtual bool StopSpeaking() override; + virtual bool IsSpeaking() override; + virtual void GetVoices(std::vector<VoiceData>* out_voices) override; + virtual void Pause() override {} + virtual void Resume() override {} + virtual std::string error() override; + virtual void clear_error() override {} + virtual void set_error(const std::string& error) override {} virtual void WillSpeakUtteranceWithVoice( - const Utterance* utterance, const VoiceData& voice_data) OVERRIDE; + const Utterance* utterance, const VoiceData& voice_data) override; private: scoped_refptr<content::MessageLoopRunner> loop_runner_; diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc index e2fde84..ef85a8d 100644 --- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc @@ -52,11 +52,11 @@ class LoggedInSpokenFeedbackTest : public InProcessBrowserTest { LoggedInSpokenFeedbackTest() {} virtual ~LoggedInSpokenFeedbackTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { AccessibilityManager::SetBrailleControllerForTest(&braille_controller_); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { AccessibilityManager::SetBrailleControllerForTest(NULL); } @@ -223,7 +223,7 @@ class SpokenFeedbackTest SpokenFeedbackTest() {} virtual ~SpokenFeedbackTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { if (GetParam() == kTestAsGuestUser) { command_line->AppendSwitch(chromeos::switches::kGuestSession); command_line->AppendSwitch(::switches::kIncognito); @@ -430,7 +430,7 @@ class GuestSpokenFeedbackTest : public LoggedInSpokenFeedbackTest { GuestSpokenFeedbackTest() {} virtual ~GuestSpokenFeedbackTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kGuestSession); command_line->AppendSwitch(::switches::kIncognito); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); @@ -466,13 +466,13 @@ class OobeSpokenFeedbackTest : public InProcessBrowserTest { OobeSpokenFeedbackTest() {} virtual ~OobeSpokenFeedbackTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kLoginManager); command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { AccessibilityManager::Get()-> SetProfileForTest(ProfileHelper::GetSigninProfile()); } diff --git a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc index 45e4079..5131458 100644 --- a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc @@ -34,7 +34,7 @@ class TouchExplorationTest : public InProcessBrowserTest { virtual ~TouchExplorationTest() {} protected: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { // The RenderView for WebContents is created as a result of the // navigation to the New Tab page which is done as part of the test // SetUp. The creation involves sending a resize message to the renderer @@ -50,7 +50,7 @@ class TouchExplorationTest : public InProcessBrowserTest { root_window_->AddPreTargetHandler(event_handler_.get()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { SwitchTouchExplorationMode(false); root_window_->RemovePreTargetHandler(event_handler_.get()); } diff --git a/chrome/browser/chromeos/app_mode/app_launch_utils.cc b/chrome/browser/chromeos/app_mode/app_launch_utils.cc index 4490e2b..b6c5f35 100644 --- a/chrome/browser/chromeos/app_mode/app_launch_utils.cc +++ b/chrome/browser/chromeos/app_mode/app_launch_utils.cc @@ -33,29 +33,29 @@ class AppLaunchManager : public StartupAppLauncher::Delegate { void Cleanup() { delete this; } // StartupAppLauncher::Delegate overrides: - virtual void InitializeNetwork() OVERRIDE { + virtual void InitializeNetwork() override { // This is on crash-restart path and assumes network is online. // TODO(xiyuan): Remove the crash-restart path for kiosk or add proper // network configure handling. startup_app_launcher_->ContinueWithNetworkReady(); } - virtual bool IsNetworkReady() OVERRIDE { + virtual bool IsNetworkReady() override { // See comments above. Network is assumed to be online here. return true; } - virtual void OnLoadingOAuthFile() OVERRIDE {} - virtual void OnInitializingTokenService() OVERRIDE {} - virtual void OnInstallingApp() OVERRIDE {} - virtual void OnReadyToLaunch() OVERRIDE { + virtual void OnLoadingOAuthFile() override {} + virtual void OnInitializingTokenService() override {} + virtual void OnInstallingApp() override {} + virtual void OnReadyToLaunch() override { startup_app_launcher_->LaunchApp(); } - virtual void OnLaunchSucceeded() OVERRIDE { Cleanup(); } - virtual void OnLaunchFailed(KioskAppLaunchError::Error error) OVERRIDE { + virtual void OnLaunchSucceeded() override { Cleanup(); } + virtual void OnLaunchFailed(KioskAppLaunchError::Error error) override { KioskAppLaunchError::Save(error); chrome::AttemptUserExit(); Cleanup(); } - virtual bool IsShowingNetworkConfigScreen() OVERRIDE { return false; } + virtual bool IsShowingNetworkConfigScreen() override { return false; } scoped_ptr<StartupAppLauncher> startup_app_launcher_; diff --git a/chrome/browser/chromeos/app_mode/app_session_lifetime.cc b/chrome/browser/chromeos/app_mode/app_session_lifetime.cc index df1aead..7e63ac7 100644 --- a/chrome/browser/chromeos/app_mode/app_session_lifetime.cc +++ b/chrome/browser/chromeos/app_mode/app_session_lifetime.cc @@ -53,7 +53,7 @@ class AppWindowHandler : public AppWindowRegistry::Observer { private: // extensions::AppWindowRegistry::Observer overrides: - virtual void OnAppWindowRemoved(AppWindow* app_window) OVERRIDE { + virtual void OnAppWindowRemoved(AppWindow* app_window) override { if (window_registry_->app_windows().empty()) { if (DemoAppLauncher::IsDemoAppSession( user_manager::UserManager::Get()->GetActiveUser()->email())) { @@ -104,7 +104,7 @@ class BrowserWindowHandler : public chrome::BrowserListObserver { } // chrome::BrowserListObserver overrides: - virtual void OnBrowserAdded(Browser* browser) OVERRIDE { + virtual void OnBrowserAdded(Browser* browser) override { base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&BrowserWindowHandler::HandleBrowser, diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc index 31cf27f..3b82fd2 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc @@ -163,13 +163,13 @@ class KioskAppData::IconLoader : public ImageDecoder::Delegate { // ImageDecoder::Delegate overrides: virtual void OnImageDecoded(const ImageDecoder* decoder, - const SkBitmap& decoded_image) OVERRIDE { + const SkBitmap& decoded_image) override { icon_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image); icon_.MakeThreadSafe(); ReportResultOnBlockingPool(SUCCESS); } - virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE { + virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override { ReportResultOnBlockingPool(FAILED_TO_DECODE); } @@ -225,7 +225,7 @@ class KioskAppData::WebstoreDataParser virtual void OnWebstoreParseSuccess( const std::string& id, const SkBitmap& icon, - base::DictionaryValue* parsed_manifest) OVERRIDE { + base::DictionaryValue* parsed_manifest) override { // Takes ownership of |parsed_manifest|. extensions::Manifest manifest( extensions::Manifest::INVALID_LOCATION, @@ -243,7 +243,7 @@ class KioskAppData::WebstoreDataParser virtual void OnWebstoreParseFailure( const std::string& id, InstallHelperResultCode result_code, - const std::string& error_message) OVERRIDE { + const std::string& error_message) override { ReportFailure(); } diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.h b/chrome/browser/chromeos/app_mode/kiosk_app_data.h index 4bf061c..fa2eec3 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_data.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.h @@ -110,11 +110,11 @@ class KioskAppData : public base::SupportsWeakPtr<KioskAppData>, void StartFetch(); // extensions::WebstoreDataFetcherDelegate overrides: - virtual void OnWebstoreRequestFailure() OVERRIDE; + virtual void OnWebstoreRequestFailure() override; virtual void OnWebstoreResponseParseSuccess( - scoped_ptr<base::DictionaryValue> webstore_data) OVERRIDE; + scoped_ptr<base::DictionaryValue> webstore_data) override; virtual void OnWebstoreResponseParseFailure( - const std::string& error) OVERRIDE; + const std::string& error) override; // Helper function for testing for the existence of |key| in // |response|. Passes |key|'s content via |value| and returns diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h b/chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h index 93c8596..be8cbcb 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h @@ -24,7 +24,7 @@ class KioskAppExternalLoader void SetCurrentAppExtensions(scoped_ptr<base::DictionaryValue> prefs); // extensions::ExternalLoader overrides: - virtual void StartLoading() OVERRIDE; + virtual void StartLoading() override; private: virtual ~KioskAppExternalLoader(); diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h index eca1bcb..78a6cb5 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h @@ -227,17 +227,17 @@ class KioskAppManager : public KioskAppDataDelegate, void UpdateAppData(); // KioskAppDataDelegate overrides: - virtual void GetKioskAppIconCacheDir(base::FilePath* cache_dir) OVERRIDE; - virtual void OnKioskAppDataChanged(const std::string& app_id) OVERRIDE; - virtual void OnKioskAppDataLoadFailure(const std::string& app_id) OVERRIDE; + virtual void GetKioskAppIconCacheDir(base::FilePath* cache_dir) override; + virtual void OnKioskAppDataChanged(const std::string& app_id) override; + virtual void OnKioskAppDataLoadFailure(const std::string& app_id) override; // ExternalCache::Delegate: virtual void OnExtensionListsUpdated( - const base::DictionaryValue* prefs) OVERRIDE; - virtual void OnExtensionLoadedInCache(const std::string& id) OVERRIDE; + const base::DictionaryValue* prefs) override; + virtual void OnExtensionLoadedInCache(const std::string& id) override; virtual void OnExtensionDownloadFailed( const std::string& id, - extensions::ExtensionDownloaderDelegate::Error error) OVERRIDE; + extensions::ExtensionDownloaderDelegate::Error error) override; // Callback for EnterpriseInstallAttributes::LockDevice() during // EnableConsumerModeKiosk() call. diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc index 9b31966..16999e3 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc @@ -126,7 +126,7 @@ class AppDataLoadWaiter : public KioskAppManagerObserver { private: // KioskAppManagerObserver overrides: - virtual void OnKioskAppDataChanged(const std::string& app_id) OVERRIDE { + virtual void OnKioskAppDataChanged(const std::string& app_id) override { ++data_change_count_; if (data_change_count_ < data_loaded_threshold_) return; @@ -136,7 +136,7 @@ class AppDataLoadWaiter : public KioskAppManagerObserver { runner_->Quit(); } - virtual void OnKioskAppDataLoadFailure(const std::string& app_id) OVERRIDE { + virtual void OnKioskAppDataLoadFailure(const std::string& app_id) override { loaded_ = false; quit_ = true; if (runner_.get()) @@ -144,12 +144,12 @@ class AppDataLoadWaiter : public KioskAppManagerObserver { } virtual void OnKioskExtensionLoadedInCache( - const std::string& app_id) OVERRIDE { + const std::string& app_id) override { OnKioskAppDataChanged(app_id); } virtual void OnKioskExtensionDownloadFailed( - const std::string& app_id) OVERRIDE { + const std::string& app_id) override { OnKioskAppDataLoadFailure(app_id); } @@ -171,7 +171,7 @@ class KioskAppManagerTest : public InProcessBrowserTest { virtual ~KioskAppManagerTest() {} // InProcessBrowserTest overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { base::FilePath test_data_dir; PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir); embedded_test_server()->ServeFilesFromDirectory(test_data_dir); @@ -185,21 +185,21 @@ class KioskAppManagerTest : public InProcessBrowserTest { InProcessBrowserTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { InProcessBrowserTest::SetUpCommandLine(command_line); // Initialize fake_cws_ to setup web store gallery. fake_cws_->Init(embedded_test_server()); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { InProcessBrowserTest::SetUpOnMainThread(); // Restart the thread as the sandbox host process has already been spawned. embedded_test_server()->RestartThreadAndListen(); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); host_resolver()->AddRule("*", "127.0.0.1"); diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h index 9b212a7..73c7836 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h @@ -50,19 +50,19 @@ class KioskAppUpdateService : public KeyedService, void ForceAppUpdateRestart(); // KeyedService overrides: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // extensions::UpdateObserver overrides: virtual void OnAppUpdateAvailable( - const extensions::Extension* extension) OVERRIDE; - virtual void OnChromeUpdateAvailable() OVERRIDE {} + const extensions::Extension* extension) override; + virtual void OnChromeUpdateAvailable() override {} // system::AutomaticRebootManagerObserver overrides: - virtual void OnRebootScheduled(Reason reason) OVERRIDE; - virtual void WillDestroyAutomaticRebootManager() OVERRIDE; + virtual void OnRebootScheduled(Reason reason) override; + virtual void WillDestroyAutomaticRebootManager() override; // KioskAppManagerObserver overrides: - virtual void OnKioskAppCacheUpdated(const std::string& app_id) OVERRIDE; + virtual void OnKioskAppCacheUpdated(const std::string& app_id) override; Profile* profile_; std::string app_id_; @@ -94,7 +94,7 @@ class KioskAppUpdateServiceFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory overrides: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; }; } // namespace chromeos diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc index 9aea82c..429beb2 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc @@ -42,7 +42,7 @@ class KioskAppUpdateServiceTest : public extensions::PlatformAppBrowserTest { virtual ~KioskAppUpdateServiceTest() {} // extensions::PlatformAppBrowserTest overrides: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { extensions::PlatformAppBrowserTest::SetUpOnMainThread(); ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); diff --git a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc index af74890a..5c17b68 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc @@ -48,7 +48,7 @@ class KioskDiagnosisRunner::Factory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory overrides: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE { + content::BrowserContext* context) const override { Profile* profile = static_cast<Profile*>(context); return new KioskDiagnosisRunner(profile); } diff --git a/chrome/browser/chromeos/app_mode/kiosk_external_update_validator.h b/chrome/browser/chromeos/app_mode/kiosk_external_update_validator.h index b3742e2..3d58a9d 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_external_update_validator.h +++ b/chrome/browser/chromeos/app_mode/kiosk_external_update_validator.h @@ -51,12 +51,12 @@ class KioskExternalUpdateValidator virtual ~KioskExternalUpdateValidator(); // SandboxedUnpackerClient overrides. - virtual void OnUnpackFailure(const base::string16& error_message) OVERRIDE; + virtual void OnUnpackFailure(const base::string16& error_message) override; virtual void OnUnpackSuccess(const base::FilePath& temp_dir, const base::FilePath& extension_dir, const base::DictionaryValue* original_manifest, const extensions::Extension* extension, - const SkBitmap& install_icon) OVERRIDE; + const SkBitmap& install_icon) override; // Task runner for executing file I/O tasks. const scoped_refptr<base::SequencedTaskRunner> backend_task_runner_; diff --git a/chrome/browser/chromeos/app_mode/kiosk_external_updater.h b/chrome/browser/chromeos/app_mode/kiosk_external_updater.h index 2dcd2fe..e24bd78 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_external_updater.h +++ b/chrome/browser/chromeos/app_mode/kiosk_external_updater.h @@ -54,25 +54,25 @@ class KioskExternalUpdater : public disks::DiskMountManager::Observer, // disks::DiskMountManager::Observer overrides. virtual void OnDiskEvent(disks::DiskMountManager::DiskEvent event, - const disks::DiskMountManager::Disk* disk) OVERRIDE; + const disks::DiskMountManager::Disk* disk) override; virtual void OnDeviceEvent(disks::DiskMountManager::DeviceEvent event, - const std::string& device_path) OVERRIDE; + const std::string& device_path) override; virtual void OnMountEvent( disks::DiskMountManager::MountEvent event, MountError error_code, - const disks::DiskMountManager::MountPointInfo& mount_info) OVERRIDE; + const disks::DiskMountManager::MountPointInfo& mount_info) override; virtual void OnFormatEvent(disks::DiskMountManager::FormatEvent event, FormatError error_code, - const std::string& device_path) OVERRIDE; + const std::string& device_path) override; // KioskExternalUpdateValidatorDelegate overrides: virtual void OnExtenalUpdateUnpackSuccess( const std::string& app_id, const std::string& version, const std::string& min_browser_version, - const base::FilePath& temp_dir) OVERRIDE; + const base::FilePath& temp_dir) override; virtual void OnExternalUpdateUnpackFailure( - const std::string& app_id) OVERRIDE; + const std::string& app_id) override; // Processes the parsed external update manifest, check |parsing_error| for // any manifest parsing error. diff --git a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h index 4bb327b..965e56d 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h +++ b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h @@ -30,10 +30,10 @@ class KioskModeIdleAppNameNotification : public wm::UserActivityObserver, void Setup(); // wm::UserActivityObserver overrides: - virtual void OnUserActivity(const ui::Event* event) OVERRIDE; + virtual void OnUserActivity(const ui::Event* event) override; // PowerManagerClient::Observer overrides: - virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE; + virtual void SuspendDone(const base::TimeDelta& sleep_duration) override; // Begins listening for user activity and calls ResetTimer(). void Start(); diff --git a/chrome/browser/chromeos/app_mode/kiosk_profile_loader.h b/chrome/browser/chromeos/app_mode/kiosk_profile_loader.h index 0147582..84b4362 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_profile_loader.h +++ b/chrome/browser/chromeos/app_mode/kiosk_profile_loader.h @@ -49,15 +49,15 @@ class KioskProfileLoader : public LoginPerformer::Delegate, void ReportLaunchResult(KioskAppLaunchError::Error error); // LoginPerformer::Delegate overrides - virtual void OnAuthSuccess(const UserContext& user_context) OVERRIDE; - virtual void OnAuthFailure(const AuthFailure& error) OVERRIDE; - virtual void WhiteListCheckFailed(const std::string& email) OVERRIDE; - virtual void PolicyLoadFailed() OVERRIDE; + virtual void OnAuthSuccess(const UserContext& user_context) override; + virtual void OnAuthFailure(const AuthFailure& error) override; + virtual void WhiteListCheckFailed(const std::string& email) override; + virtual void PolicyLoadFailed() override; virtual void OnOnlineChecked( - const std::string& email, bool success) OVERRIDE; + const std::string& email, bool success) override; // LoginUtils::Delegate implementation: - virtual void OnProfilePrepared(Profile* profile) OVERRIDE; + virtual void OnProfilePrepared(Profile* profile) override; std::string user_id_; bool use_guest_mount_; diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.h b/chrome/browser/chromeos/app_mode/startup_app_launcher.h index 3dcafb4..b7e3a6e 100644 --- a/chrome/browser/chromeos/app_mode/startup_app_launcher.h +++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.h @@ -103,18 +103,18 @@ class StartupAppLauncher : public base::SupportsWeakPtr<StartupAppLauncher>, void OnKioskAppDataLoadStatusChanged(const std::string& app_id); // OAuth2TokenService::Observer overrides. - virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE; - virtual void OnRefreshTokensLoaded() OVERRIDE; + virtual void OnRefreshTokenAvailable(const std::string& account_id) override; + virtual void OnRefreshTokensLoaded() override; // extensions::InstallObserver overrides. virtual void OnFinishCrxInstall(const std::string& extension_id, - bool success) OVERRIDE; + bool success) override; // KioskAppManagerObserver overrides. virtual void OnKioskExtensionLoadedInCache( - const std::string& app_id) OVERRIDE; + const std::string& app_id) override; virtual void OnKioskExtensionDownloadFailed( - const std::string& app_id) OVERRIDE; + const std::string& app_id) override; Profile* profile_; const std::string app_id_; diff --git a/chrome/browser/chromeos/attestation/attestation_ca_client.h b/chrome/browser/chromeos/attestation/attestation_ca_client.h index fbd8f00..30c1159 100644 --- a/chrome/browser/chromeos/attestation/attestation_ca_client.h +++ b/chrome/browser/chromeos/attestation/attestation_ca_client.h @@ -26,12 +26,12 @@ class AttestationCAClient : public ServerProxy, // chromeos::attestation::ServerProxy: virtual void SendEnrollRequest(const std::string& request, - const DataCallback& on_response) OVERRIDE; + const DataCallback& on_response) override; virtual void SendCertificateRequest(const std::string& request, - const DataCallback& on_response) OVERRIDE; + const DataCallback& on_response) override; // net::URLFetcherDelegate: - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; private: typedef std::map<const net::URLFetcher*, DataCallback> FetcherCallbackMap; diff --git a/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc b/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc index 3364de9..bce7ccc 100644 --- a/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc +++ b/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc @@ -24,7 +24,7 @@ namespace policy { class CustomFakeCryptohomeClient : public chromeos::FakeCryptohomeClient { public: virtual void TpmAttestationIsEnrolled( - const chromeos::BoolDBusMethodCallback& callback) OVERRIDE { + const chromeos::BoolDBusMethodCallback& callback) override { base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(callback, chromeos::DBUS_METHOD_CALL_FAILURE, false)); @@ -36,15 +36,15 @@ class AttestationDevicePolicyTest public chromeos::DeviceSettingsService::Observer { public: // DeviceSettingsService::Observer - virtual void OwnershipStatusChanged() OVERRIDE {} - virtual void DeviceSettingsUpdated() OVERRIDE { + virtual void OwnershipStatusChanged() override {} + virtual void DeviceSettingsUpdated() override { operation_complete_ = true; } protected: AttestationDevicePolicyTest() : operation_complete_(false) {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture(); InstallOwnerKey(); RefreshDevicePolicy(); diff --git a/chrome/browser/chromeos/attestation/platform_verification_dialog.h b/chrome/browser/chromeos/attestation/platform_verification_dialog.h index 4afdf94..0777cd7 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_dialog.h +++ b/chrome/browser/chromeos/attestation/platform_verification_dialog.h @@ -38,21 +38,21 @@ class PlatformVerificationDialog : public views::DialogDelegateView, const PlatformVerificationFlow::Delegate::ConsentCallback& callback); // Overridden from views::DialogDelegate: - virtual bool Cancel() OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual bool Close() OVERRIDE; + virtual bool Cancel() override; + virtual bool Accept() override; + virtual bool Close() override; virtual base::string16 GetDialogButtonLabel( - ui::DialogButton button) const OVERRIDE; + ui::DialogButton button) const override; // Overridden from views::WidgetDelegate: - virtual ui::ModalType GetModalType() const OVERRIDE; + virtual ui::ModalType GetModalType() const override; // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; // Overridden from views::StyledLabelListener: virtual void StyledLabelLinkClicked(const gfx::Range& range, - int event_flags) OVERRIDE; + int event_flags) override; content::WebContents* web_contents_; base::string16 domain_; diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/chrome/browser/chromeos/attestation/platform_verification_flow.cc index cc49b8e..4c5b775 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_flow.cc +++ b/chrome/browser/chromeos/attestation/platform_verification_flow.cc @@ -80,15 +80,15 @@ class DefaultDelegate : public PlatformVerificationFlow::Delegate { virtual void ShowConsentPrompt( content::WebContents* web_contents, const PlatformVerificationFlow::Delegate::ConsentCallback& callback) - OVERRIDE { + override { PlatformVerificationDialog::ShowDialog(web_contents, callback); } - virtual PrefService* GetPrefs(content::WebContents* web_contents) OVERRIDE { + virtual PrefService* GetPrefs(content::WebContents* web_contents) override { return user_prefs::UserPrefs::Get(web_contents->GetBrowserContext()); } - virtual const GURL& GetURL(content::WebContents* web_contents) OVERRIDE { + virtual const GURL& GetURL(content::WebContents* web_contents) override { const GURL& url = web_contents->GetLastCommittedURL(); if (!url.is_valid()) return web_contents->GetVisibleURL(); @@ -96,18 +96,18 @@ class DefaultDelegate : public PlatformVerificationFlow::Delegate { } virtual user_manager::User* GetUser( - content::WebContents* web_contents) OVERRIDE { + content::WebContents* web_contents) override { return ProfileHelper::Get()->GetUserByProfile( Profile::FromBrowserContext(web_contents->GetBrowserContext())); } virtual HostContentSettingsMap* GetContentSettings( - content::WebContents* web_contents) OVERRIDE { + content::WebContents* web_contents) override { return Profile::FromBrowserContext(web_contents->GetBrowserContext())-> GetHostContentSettingsMap(); } - virtual bool IsGuestOrIncognito(content::WebContents* web_contents) OVERRIDE { + virtual bool IsGuestOrIncognito(content::WebContents* web_contents) override { Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext()); return (profile->IsOffTheRecord() || profile->IsGuestSession()); diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc b/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc index ad591c0..0ea4be4 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc +++ b/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc @@ -76,30 +76,30 @@ class FakeDelegate : public PlatformVerificationFlow::Delegate { virtual void ShowConsentPrompt( content::WebContents* web_contents, const PlatformVerificationFlow::Delegate::ConsentCallback& callback) - OVERRIDE { + override { num_consent_calls_++; callback.Run(response_); } - virtual PrefService* GetPrefs(content::WebContents* web_contents) OVERRIDE { + virtual PrefService* GetPrefs(content::WebContents* web_contents) override { return &pref_service_; } - virtual const GURL& GetURL(content::WebContents* web_contents) OVERRIDE { + virtual const GURL& GetURL(content::WebContents* web_contents) override { return url_; } virtual user_manager::User* GetUser( - content::WebContents* web_contents) OVERRIDE { + content::WebContents* web_contents) override { return mock_user_manager_.GetActiveUser(); } virtual HostContentSettingsMap* GetContentSettings( - content::WebContents* web_contents) OVERRIDE { + content::WebContents* web_contents) override { return content_settings_.get(); } - virtual bool IsGuestOrIncognito(content::WebContents* web_contents) OVERRIDE { + virtual bool IsGuestOrIncognito(content::WebContents* web_contents) override { return is_incognito_; } @@ -141,7 +141,7 @@ class CustomFakeCryptohomeClient : public FakeCryptohomeClient { attestation_enrolled_(true), attestation_prepared_(true) {} virtual void TpmAttestationIsEnrolled( - const BoolDBusMethodCallback& callback) OVERRIDE { + const BoolDBusMethodCallback& callback) override { base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, call_status_, @@ -149,7 +149,7 @@ class CustomFakeCryptohomeClient : public FakeCryptohomeClient { } virtual void TpmAttestationIsPrepared( - const BoolDBusMethodCallback& callback) OVERRIDE { + const BoolDBusMethodCallback& callback) override { base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, call_status_, diff --git a/chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h b/chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h index e6ecdc7..e8deb3e 100644 --- a/chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h +++ b/chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h @@ -22,19 +22,19 @@ class AudioDevicesPrefHandlerImpl : public AudioDevicesPrefHandler { explicit AudioDevicesPrefHandlerImpl(PrefService* local_state); // Overridden from AudioDevicesPrefHandler. - virtual double GetOutputVolumeValue(const AudioDevice* device) OVERRIDE; - virtual double GetInputGainValue(const AudioDevice* device) OVERRIDE; + virtual double GetOutputVolumeValue(const AudioDevice* device) override; + virtual double GetInputGainValue(const AudioDevice* device) override; virtual void SetVolumeGainValue(const AudioDevice& device, - double value) OVERRIDE; + double value) override; - virtual bool GetMuteValue(const AudioDevice& device) OVERRIDE; - virtual void SetMuteValue(const AudioDevice& device, bool mute_on) OVERRIDE; + virtual bool GetMuteValue(const AudioDevice& device) override; + virtual void SetMuteValue(const AudioDevice& device, bool mute_on) override; - virtual bool GetAudioCaptureAllowedValue() OVERRIDE; - virtual bool GetAudioOutputAllowedValue() OVERRIDE; + virtual bool GetAudioCaptureAllowedValue() override; + virtual bool GetAudioOutputAllowedValue() override; - virtual void AddAudioPrefObserver(AudioPrefObserver* observer) OVERRIDE; - virtual void RemoveAudioPrefObserver(AudioPrefObserver* observer) OVERRIDE; + virtual void AddAudioPrefObserver(AudioPrefObserver* observer) override; + virtual void RemoveAudioPrefObserver(AudioPrefObserver* observer) override; // Registers volume and mute preferences. static void RegisterPrefs(PrefRegistrySimple* registry); diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc index 4dc4584..b551e7c 100644 --- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc +++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc @@ -46,22 +46,22 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate { virtual ~UserWallpaperDelegate() { } - virtual int GetAnimationType() OVERRIDE { + virtual int GetAnimationType() override { return ShouldShowInitialAnimation() ? ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE : static_cast<int>(wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); } - virtual int GetAnimationDurationOverride() OVERRIDE { + virtual int GetAnimationDurationOverride() override { return animation_duration_override_in_ms_; } virtual void SetAnimationDurationOverride( - int animation_duration_in_ms) OVERRIDE { + int animation_duration_in_ms) override { animation_duration_override_in_ms_ = animation_duration_in_ms; } - virtual bool ShouldShowInitialAnimation() OVERRIDE { + virtual bool ShouldShowInitialAnimation() override { if (IsNormalWallpaperChange() || boot_animation_finished_) return false; @@ -77,20 +77,20 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate { return true; } - virtual void UpdateWallpaper(bool clear_cache) OVERRIDE { + virtual void UpdateWallpaper(bool clear_cache) override { chromeos::WallpaperManager::Get()->UpdateWallpaper(clear_cache); } - virtual void InitializeWallpaper() OVERRIDE { + virtual void InitializeWallpaper() override { chromeos::WallpaperManager::Get()->InitializeWallpaper(); } - virtual void OpenSetWallpaperPage() OVERRIDE { + virtual void OpenSetWallpaperPage() override { if (CanOpenSetWallpaperPage()) wallpaper_manager_util::OpenWallpaperManager(); } - virtual bool CanOpenSetWallpaperPage() OVERRIDE { + virtual bool CanOpenSetWallpaperPage() override { const LoginState* login_state = LoginState::Get(); const LoginState::LoggedInUserType user_type = login_state->GetLoggedInUserType(); @@ -114,14 +114,14 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate { return true; } - virtual void OnWallpaperAnimationFinished() OVERRIDE { + virtual void OnWallpaperAnimationFinished() override { content::NotificationService::current()->Notify( chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED, content::NotificationService::AllSources(), content::NotificationService::NoDetails()); } - virtual void OnWallpaperBootAnimationFinished() OVERRIDE { + virtual void OnWallpaperBootAnimationFinished() override { // Make sure that boot animation type is used only once. boot_animation_finished_ = true; } diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h b/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h index 53cf426..a043977 100644 --- a/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h +++ b/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h @@ -29,20 +29,20 @@ class BluetoothPairingDialog : public ui::WebDialogDelegate { protected: // ui::WebDialogDelegate implementation. - virtual ui::ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ui::ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const override; + virtual void GetDialogSize(gfx::Size* size) const override; + virtual std::string GetDialogArgs() const override; // NOTE: This function deletes this object at the end. - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnCloseContents( - content::WebContents* source, bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + content::WebContents* source, bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; virtual bool HandleContextMenu( - const content::ContextMenuParams& params) OVERRIDE; + const content::ContextMenuParams& params) override; private: gfx::NativeWindow parent_window_; diff --git a/chrome/browser/chromeos/boot_times_loader.h b/chrome/browser/chromeos/boot_times_loader.h index d9622b6..843d6d4 100644 --- a/chrome/browser/chromeos/boot_times_loader.h +++ b/chrome/browser/chromeos/boot_times_loader.h @@ -42,9 +42,9 @@ class BootTimesLoader : public content::NotificationObserver, // LoginEventRecorder::Delegate override. virtual void AddLoginTimeMarker(const std::string& marker_name, - bool send_to_uma) OVERRIDE; - virtual void RecordAuthenticationSuccess() OVERRIDE; - virtual void RecordAuthenticationFailure() OVERRIDE; + bool send_to_uma) override; + virtual void RecordAuthenticationSuccess() override; + virtual void RecordAuthenticationFailure() override; // Add a time marker for logout. A timeline will be dumped to // /tmp/logout-times-sent after logout is done. If |send_to_uma| is true @@ -73,7 +73,7 @@ class BootTimesLoader : public content::NotificationObserver, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Records "LoginDone" event. void LoginDone(bool is_user_new); diff --git a/chrome/browser/chromeos/charger_replace/charger_link_dialog.h b/chrome/browser/chromeos/charger_replace/charger_link_dialog.h index d41f4ff..e8fe82d 100644 --- a/chrome/browser/chromeos/charger_replace/charger_link_dialog.h +++ b/chrome/browser/chromeos/charger_replace/charger_link_dialog.h @@ -21,20 +21,20 @@ class ChargerLinkDialog : public ui::WebDialogDelegate { private: // ui::WebDialogDelegate implementation. - virtual ui::ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ui::ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const override; + virtual void GetDialogSize(gfx::Size* size) const override; + virtual std::string GetDialogArgs() const override; // NOTE: This function deletes this object at the end. - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnCloseContents( - content::WebContents* source, bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + content::WebContents* source, bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; virtual bool HandleContextMenu( - const content::ContextMenuParams& params) OVERRIDE; + const content::ContextMenuParams& params) override; gfx::NativeWindow parent_window_; std::string url_; diff --git a/chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h b/chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h index 70a9f74c..1cf99b9 100644 --- a/chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h +++ b/chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h @@ -31,22 +31,22 @@ class ChargerReplacementDialog : public ui::WebDialogDelegate { private: // ui::WebDialogDelegate implementation. - virtual ui::ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ui::ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual void GetMinimumDialogSize(gfx::Size* size) const OVERRIDE; - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; - virtual bool CanCloseDialog() const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const override; + virtual void GetMinimumDialogSize(gfx::Size* size) const override; + virtual void GetDialogSize(gfx::Size* size) const override; + virtual std::string GetDialogArgs() const override; + virtual bool CanCloseDialog() const override; // NOTE: This function deletes this object at the end. - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnCloseContents( - content::WebContents* source, bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + content::WebContents* source, bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; virtual bool HandleContextMenu( - const content::ContextMenuParams& params) OVERRIDE; + const content::ContextMenuParams& params) override; static bool is_window_visible_; static gfx::NativeWindow current_window_; diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h index e987b01..828bd5b 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h @@ -50,19 +50,19 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux { virtual ~ChromeBrowserMainPartsChromeos(); // ChromeBrowserMainParts overrides. - virtual void PreEarlyInitialization() OVERRIDE; - virtual void PreMainMessageLoopStart() OVERRIDE; - virtual void PostMainMessageLoopStart() OVERRIDE; - virtual void PreMainMessageLoopRun() OVERRIDE; + virtual void PreEarlyInitialization() override; + virtual void PreMainMessageLoopStart() override; + virtual void PostMainMessageLoopStart() override; + virtual void PreMainMessageLoopRun() override; // Stages called from PreMainMessageLoopRun. - virtual void PreProfileInit() OVERRIDE; - virtual void PostProfileInit() OVERRIDE; - virtual void PreBrowserStart() OVERRIDE; - virtual void PostBrowserStart() OVERRIDE; + virtual void PreProfileInit() override; + virtual void PostProfileInit() override; + virtual void PreBrowserStart() override; + virtual void PostBrowserStart() override; - virtual void PostMainMessageLoopRun() OVERRIDE; - virtual void PostDestroyThreads() OVERRIDE; + virtual void PostMainMessageLoopRun() override; + virtual void PostDestroyThreads() override; private: scoped_ptr<default_app_order::ExternalLoader> app_order_loader_; diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index 5edc590..35985dc 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -172,7 +172,7 @@ class ServicesCustomizationExternalLoader } // Implementation of extensions::ExternalLoader: - virtual void StartLoading() OVERRIDE { + virtual void StartLoading() override { if (!is_apps_set_) { ServicesCustomizationDocument::GetInstance()->StartFetching(); // In case of missing customization ID, SetCurrentApps will be called diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h index 4322855..ce3378a 100644 --- a/chrome/browser/chromeos/customization_document.h +++ b/chrome/browser/chromeos/customization_document.h @@ -222,10 +222,10 @@ class ServicesCustomizationDocument : public CustomizationDocument, static void SetApplied(bool val); // Overriden from CustomizationDocument: - virtual bool LoadManifestFromString(const std::string& manifest) OVERRIDE; + virtual bool LoadManifestFromString(const std::string& manifest) override; // Overriden from net::URLFetcherDelegate: - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; // Initiate file fetching. Wait for online status. void StartFileFetch(); diff --git a/chrome/browser/chromeos/customization_document_unittest.cc b/chrome/browser/chromeos/customization_document_unittest.cc index 2590fbe..c4158dc 100644 --- a/chrome/browser/chromeos/customization_document_unittest.cc +++ b/chrome/browser/chromeos/customization_document_unittest.cc @@ -218,7 +218,7 @@ class ServicesCustomizationDocumentTest : public testing::Test { } // testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ServicesCustomizationDocument::InitializeForTesting(); EXPECT_CALL(mock_statistics_provider_, GetMachineStatistic(_, NotNull())) @@ -250,7 +250,7 @@ class ServicesCustomizationDocumentTest : public testing::Test { ServicesCustomizationDocument::RegisterPrefs(local_state_.registry()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { TestingBrowserProcess::GetGlobal()->SetLocalState(NULL); NetworkHandler::Shutdown(); DBusThreadManager::Shutdown(); diff --git a/chrome/browser/chromeos/customization_wallpaper_downloader.h b/chrome/browser/chromeos/customization_wallpaper_downloader.h index b1d9036..7f97901 100644 --- a/chrome/browser/chromeos/customization_wallpaper_downloader.h +++ b/chrome/browser/chromeos/customization_wallpaper_downloader.h @@ -50,7 +50,7 @@ class CustomizationWallpaperDownloader : public net::URLFetcherDelegate { void Start(); // net::URLFetcherDelegate - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; // This is called in tests to modify (lower) retry delay. void set_retry_delay_for_testing(base::TimeDelta value) { diff --git a/chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc b/chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc index f900896..5088387 100644 --- a/chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc +++ b/chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc @@ -68,7 +68,7 @@ class TestWallpaperObserver : public WallpaperManager::Observer { wallpaper_manager_->RemoveObserver(this); } - virtual void OnWallpaperAnimationFinished(const std::string&) OVERRIDE { + virtual void OnWallpaperAnimationFinished(const std::string&) override { finished_ = true; base::MessageLoop::current()->Quit(); } @@ -226,17 +226,17 @@ class CustomizationWallpaperDownloaderBrowserTest virtual ~CustomizationWallpaperDownloaderBrowserTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { controller_ = ash::Shell::GetInstance()->desktop_background_controller(); local_state_ = g_browser_process->local_state(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kLoginManager); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); } - virtual void TearDownOnMainThread() OVERRIDE { controller_ = NULL; } + virtual void TearDownOnMainThread() override { controller_ = NULL; } protected: void CreateCmdlineWallpapers() { diff --git a/chrome/browser/chromeos/dbus/display_power_service_provider.h b/chrome/browser/chromeos/dbus/display_power_service_provider.h index cc42db8..691fb29 100644 --- a/chrome/browser/chromeos/dbus/display_power_service_provider.h +++ b/chrome/browser/chromeos/dbus/display_power_service_provider.h @@ -32,7 +32,7 @@ class DisplayPowerServiceProvider // CrosDBusService::ServiceProviderInterface overrides: virtual void Start( - scoped_refptr<dbus::ExportedObject> exported_object) OVERRIDE; + scoped_refptr<dbus::ExportedObject> exported_object) override; private: // Called from ExportedObject when a handler is exported as a D-Bus diff --git a/chrome/browser/chromeos/dbus/liveness_service_provider.h b/chrome/browser/chromeos/dbus/liveness_service_provider.h index c18e1181..8d0c87e 100644 --- a/chrome/browser/chromeos/dbus/liveness_service_provider.h +++ b/chrome/browser/chromeos/dbus/liveness_service_provider.h @@ -41,7 +41,7 @@ class LivenessServiceProvider // CrosDBusService::ServiceProviderInterface overrides: virtual void Start( - scoped_refptr<dbus::ExportedObject> exported_object) OVERRIDE; + scoped_refptr<dbus::ExportedObject> exported_object) override; private: // Called from ExportedObject when CheckLiveness() is exported as a D-Bus diff --git a/chrome/browser/chromeos/dbus/printer_service_provider.h b/chrome/browser/chromeos/dbus/printer_service_provider.h index 42381be..988a51d 100644 --- a/chrome/browser/chromeos/dbus/printer_service_provider.h +++ b/chrome/browser/chromeos/dbus/printer_service_provider.h @@ -51,7 +51,7 @@ class PrinterServiceProvider // CrosDBusService::ServiceProviderInterface override. virtual void Start( - scoped_refptr<dbus::ExportedObject> exported_object) OVERRIDE; + scoped_refptr<dbus::ExportedObject> exported_object) override; protected: virtual void ShowCloudPrintHelp(const std::string& vendor, diff --git a/chrome/browser/chromeos/dbus/printer_service_provider_unittest.cc b/chrome/browser/chromeos/dbus/printer_service_provider_unittest.cc index b21e7ec..ebf09e4 100644 --- a/chrome/browser/chromeos/dbus/printer_service_provider_unittest.cc +++ b/chrome/browser/chromeos/dbus/printer_service_provider_unittest.cc @@ -20,11 +20,11 @@ class MockPrinterServiceProvider : public PrinterServiceProvider { class PrinterServiceProviderTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test_helper_.SetUp(kPrinterAdded, &service_provider_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test_helper_.TearDown(); } diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc index 013ae80..49e536a 100644 --- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc +++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc @@ -79,7 +79,7 @@ class ProxyResolverImpl : public ProxyResolverInterface { const std::string& source_url, const std::string& signal_interface, const std::string& signal_name, - scoped_refptr<dbus::ExportedObject> exported_object) OVERRIDE { + scoped_refptr<dbus::ExportedObject> exported_object) override { DCHECK(OnOriginThread()); // Create a request slot for this proxy resolution request. diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h index 3242ce7..3fea2ef 100644 --- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h +++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h @@ -81,7 +81,7 @@ class ProxyResolutionServiceProvider // CrosDBusService::ServiceProviderInterface override. virtual void Start( - scoped_refptr<dbus::ExportedObject> exported_object) OVERRIDE; + scoped_refptr<dbus::ExportedObject> exported_object) override; // Creates the instance. static ProxyResolutionServiceProvider* Create(); diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc index 531d85d..08eb756 100644 --- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc +++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc @@ -55,7 +55,7 @@ class ProxyResolutionServiceProviderTest : public testing::Test { : signal_received_successfully_(false) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Create a mock proxy resolver. Will be owned by // |proxy_resolution_service|. MockProxyResolver* mock_resolver = new MockProxyResolver; @@ -86,7 +86,7 @@ class ProxyResolutionServiceProviderTest : public testing::Test { base::Unretained(this))); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test_helper_.TearDown(); service_provider_.reset(); } diff --git a/chrome/browser/chromeos/dbus/screen_lock_service_provider.h b/chrome/browser/chromeos/dbus/screen_lock_service_provider.h index 530772e..83a0658 100644 --- a/chrome/browser/chromeos/dbus/screen_lock_service_provider.h +++ b/chrome/browser/chromeos/dbus/screen_lock_service_provider.h @@ -30,7 +30,7 @@ class ScreenLockServiceProvider // CrosDBusService::ServiceProviderInterface overrides: virtual void Start( - scoped_refptr<dbus::ExportedObject> exported_object) OVERRIDE; + scoped_refptr<dbus::ExportedObject> exported_object) override; private: // Called from ExportedObject when a handler is exported as a D-Bus diff --git a/chrome/browser/chromeos/device/input_service_proxy.cc b/chrome/browser/chromeos/device/input_service_proxy.cc index f07bce6..a6fe2c5 100644 --- a/chrome/browser/chromeos/device/input_service_proxy.cc +++ b/chrome/browser/chromeos/device/input_service_proxy.cc @@ -55,7 +55,7 @@ class InputServiceProxy::ServiceObserver : public InputServiceLinux::Observer { // InputServiceLinux::Observer implementation: virtual void OnInputDeviceAdded( - const InputServiceLinux::InputDeviceInfo& info) OVERRIDE { + const InputServiceLinux::InputDeviceInfo& info) override { DCHECK(CalledOnValidThread()); BrowserThread::PostTask( BrowserThread::UI, @@ -63,7 +63,7 @@ class InputServiceProxy::ServiceObserver : public InputServiceLinux::Observer { base::Bind(&InputServiceProxy::OnDeviceAdded, proxy_, info)); } - virtual void OnInputDeviceRemoved(const std::string& id) OVERRIDE { + virtual void OnInputDeviceRemoved(const std::string& id) override { DCHECK(CalledOnValidThread()); BrowserThread::PostTask( BrowserThread::UI, diff --git a/chrome/browser/chromeos/device/input_service_proxy_browsertest.cc b/chrome/browser/chromeos/device/input_service_proxy_browsertest.cc index d55451d..93fd7fe 100644 --- a/chrome/browser/chromeos/device/input_service_proxy_browsertest.cc +++ b/chrome/browser/chromeos/device/input_service_proxy_browsertest.cc @@ -41,14 +41,14 @@ class TestObserver : public InputServiceProxy::Observer { : wait_for_device_addition_(false), wait_for_device_removal_(false) {} virtual ~TestObserver() {} - virtual void OnInputDeviceAdded(const InputDeviceInfo& info) OVERRIDE { + virtual void OnInputDeviceAdded(const InputDeviceInfo& info) override { if (!wait_for_device_addition_) return; EXPECT_TRUE(Equals(expected_info_, info)); done_.Run(); } - virtual void OnInputDeviceRemoved(const std::string& id) OVERRIDE { + virtual void OnInputDeviceRemoved(const std::string& id) override { if (!wait_for_device_removal_) return; EXPECT_EQ(expected_id_, id); diff --git a/chrome/browser/chromeos/device_uma.h b/chrome/browser/chromeos/device_uma.h index 7bff758..1ce9d2f 100644 --- a/chrome/browser/chromeos/device_uma.h +++ b/chrome/browser/chromeos/device_uma.h @@ -28,8 +28,8 @@ class DeviceUMA : public ui::PlatformEventObserver { virtual ~DeviceUMA(); // ui::PlatformEventObserver: - virtual void WillProcessEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual void DidProcessEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual void WillProcessEvent(const ui::PlatformEvent& event) override; + virtual void DidProcessEvent(const ui::PlatformEvent& event) override; // Check CrOS touchpad events to see if the metrics gesture is present void CheckTouchpadEvent(XEvent* event); diff --git a/chrome/browser/chromeos/display/display_configuration_observer.h b/chrome/browser/chromeos/display/display_configuration_observer.h index 619a249..c2a43483 100644 --- a/chrome/browser/chromeos/display/display_configuration_observer.h +++ b/chrome/browser/chromeos/display/display_configuration_observer.h @@ -20,8 +20,8 @@ class DisplayConfigurationObserver : public ash::DisplayController::Observer { protected: // ash::DisplayController::Observer overrides: - virtual void OnDisplaysInitialized() OVERRIDE; - virtual void OnDisplayConfigurationChanged() OVERRIDE; + virtual void OnDisplaysInitialized() override; + virtual void OnDisplayConfigurationChanged() override; DISALLOW_COPY_AND_ASSIGN(DisplayConfigurationObserver); }; diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc index 4c63885..fb1387d 100644 --- a/chrome/browser/chromeos/display/display_preferences_unittest.cc +++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc @@ -50,7 +50,7 @@ class DisplayPreferencesTest : public ash::test::AshTestBase { virtual ~DisplayPreferencesTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn()) .WillRepeatedly(testing::Return(false)); EXPECT_CALL(*mock_user_manager_, Shutdown()); @@ -60,7 +60,7 @@ class DisplayPreferencesTest : public ash::test::AshTestBase { observer_.reset(new DisplayConfigurationObserver()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { observer_.reset(); TestingBrowserProcess::GetGlobal()->SetLocalState(NULL); ash::test::AshTestBase::TearDown(); diff --git a/chrome/browser/chromeos/display/overscan_calibrator.h b/chrome/browser/chromeos/display/overscan_calibrator.h index 720f4f6..7def2d0 100644 --- a/chrome/browser/chromeos/display/overscan_calibrator.h +++ b/chrome/browser/chromeos/display/overscan_calibrator.h @@ -41,11 +41,11 @@ class OverscanCalibrator : public ui::LayerDelegate { private: // ui::LayerDelegate overrides: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaintLayer(gfx::Canvas* canvas) override; virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE; - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE; + const gfx::Rect& damage_rect_in_dip) override; + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; + virtual base::Closure PrepareForLayerBoundsChange() override; // The target display. const gfx::Display display_; diff --git a/chrome/browser/chromeos/drive/change_list_loader.cc b/chrome/browser/chromeos/drive/change_list_loader.cc index 1f4a527..9c81672 100644 --- a/chrome/browser/chromeos/drive/change_list_loader.cc +++ b/chrome/browser/chromeos/drive/change_list_loader.cc @@ -48,7 +48,7 @@ class FullFeedFetcher : public ChangeListLoader::FeedFetcher { virtual ~FullFeedFetcher() { } - virtual void Run(const FeedFetcherCallback& callback) OVERRIDE { + virtual void Run(const FeedFetcherCallback& callback) override { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(!callback.is_null()); @@ -114,7 +114,7 @@ class DeltaFeedFetcher : public ChangeListLoader::FeedFetcher { virtual ~DeltaFeedFetcher() { } - virtual void Run(const FeedFetcherCallback& callback) OVERRIDE { + virtual void Run(const FeedFetcherCallback& callback) override { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(!callback.is_null()); diff --git a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc index 82e55f2..dc99493 100644 --- a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc +++ b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc @@ -51,13 +51,13 @@ class TestChangeListLoaderObserver : public ChangeListLoaderObserver { } // ChageListObserver overrides: - virtual void OnFileChanged(const FileChange& changed_files) OVERRIDE { + virtual void OnFileChanged(const FileChange& changed_files) override { changed_files_.Apply(changed_files); } - virtual void OnLoadFromServerComplete() OVERRIDE { + virtual void OnLoadFromServerComplete() override { ++load_from_server_complete_count_; } - virtual void OnInitialLoadComplete() OVERRIDE { + virtual void OnInitialLoadComplete() override { ++initial_load_complete_count_; } @@ -72,7 +72,7 @@ class TestChangeListLoaderObserver : public ChangeListLoaderObserver { class ChangeListLoaderTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); pref_service_.reset(new TestingPrefServiceSimple); test_util::RegisterDrivePrefs(pref_service_->registry()); diff --git a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc index 45efac3..44444cc 100644 --- a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc +++ b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc @@ -95,7 +95,7 @@ ScopedVector<ChangeList> CreateBaseChangeList() { class ChangeListProcessorTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); metadata_storage_.reset(new ResourceMetadataStorage( diff --git a/chrome/browser/chromeos/drive/directory_loader_unittest.cc b/chrome/browser/chromeos/drive/directory_loader_unittest.cc index 1b76de8..ef4f8da 100644 --- a/chrome/browser/chromeos/drive/directory_loader_unittest.cc +++ b/chrome/browser/chromeos/drive/directory_loader_unittest.cc @@ -47,7 +47,7 @@ class TestDirectoryLoaderObserver : public ChangeListLoaderObserver { // ChageListObserver overrides: virtual void OnDirectoryReloaded( - const base::FilePath& directory_path) OVERRIDE { + const base::FilePath& directory_path) override { changed_directories_.insert(directory_path); } @@ -68,7 +68,7 @@ void AccumulateReadDirectoryResult(ResourceEntryVector* out_entries, class DirectoryLoaderTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); pref_service_.reset(new TestingPrefServiceSimple); test_util::RegisterDrivePrefs(pref_service_->registry()); diff --git a/chrome/browser/chromeos/drive/download_handler.h b/chrome/browser/chromeos/drive/download_handler.h index ab5a17b..cd4aa10 100644 --- a/chrome/browser/chromeos/drive/download_handler.h +++ b/chrome/browser/chromeos/drive/download_handler.h @@ -76,9 +76,9 @@ class DownloadHandler : public AllDownloadItemNotifier::Observer { private: // AllDownloadItemNotifier::Observer overrides: virtual void OnDownloadCreated(content::DownloadManager* manager, - content::DownloadItem* download) OVERRIDE; + content::DownloadItem* download) override; virtual void OnDownloadUpdated(content::DownloadManager* manager, - content::DownloadItem* download) OVERRIDE; + content::DownloadItem* download) override; // Removes the download. void RemoveDownload(void* manager_id, int id); diff --git a/chrome/browser/chromeos/drive/download_handler_unittest.cc b/chrome/browser/chromeos/drive/download_handler_unittest.cc index 222729c..e081d8d 100644 --- a/chrome/browser/chromeos/drive/download_handler_unittest.cc +++ b/chrome/browser/chromeos/drive/download_handler_unittest.cc @@ -30,7 +30,7 @@ class DownloadHandlerTestFileSystem : public DummyFileSystem { // FileSystemInterface overrides. virtual void GetResourceEntry( const base::FilePath& file_path, - const GetResourceEntryCallback& callback) OVERRIDE { + const GetResourceEntryCallback& callback) override { callback.Run(error_, scoped_ptr<ResourceEntry>( error_ == FILE_ERROR_OK ? new ResourceEntry : NULL)); } @@ -39,7 +39,7 @@ class DownloadHandlerTestFileSystem : public DummyFileSystem { const base::FilePath& directory_path, bool is_exclusive, bool is_recursive, - const FileOperationCallback& callback) OVERRIDE { + const FileOperationCallback& callback) override { callback.Run(error_); } @@ -54,7 +54,7 @@ class DownloadHandlerTest : public testing::Test { DownloadHandlerTest() : download_manager_(new content::MockDownloadManager) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); // Set expectations for download item. diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.h b/chrome/browser/chromeos/drive/drive_file_stream_reader.h index 28eac15..50b36ae 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader.h +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.h @@ -63,9 +63,9 @@ class LocalReaderProxy : public ReaderProxy { // ReaderProxy overrides. virtual int Read(net::IOBuffer* buffer, int buffer_length, - const net::CompletionCallback& callback) OVERRIDE; - virtual void OnGetContent(scoped_ptr<std::string> data) OVERRIDE; - virtual void OnCompleted(FileError error) OVERRIDE; + const net::CompletionCallback& callback) override; + virtual void OnGetContent(scoped_ptr<std::string> data) override; + virtual void OnCompleted(FileError error) override; private: scoped_ptr<util::LocalFileReader> file_reader_; @@ -97,9 +97,9 @@ class NetworkReaderProxy : public ReaderProxy { // ReaderProxy overrides. virtual int Read(net::IOBuffer* buffer, int buffer_length, - const net::CompletionCallback& callback) OVERRIDE; - virtual void OnGetContent(scoped_ptr<std::string> data) OVERRIDE; - virtual void OnCompleted(FileError error) OVERRIDE; + const net::CompletionCallback& callback) override; + virtual void OnGetContent(scoped_ptr<std::string> data) override; + virtual void OnCompleted(FileError error) override; private: // The data received from the server, but not yet read. diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc index ae11afa..ca401b0 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc @@ -45,7 +45,7 @@ class LocalReaderProxyTest : public ::testing::Test { : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); ASSERT_TRUE(google_apis::test_util::CreateFileOfSpecifiedSize( temp_dir_.path(), 1024, &file_path_, &file_content_)); @@ -294,7 +294,7 @@ class DriveFileStreamReaderTest : public ::testing::Test { : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { worker_thread_.reset(new base::Thread("DriveFileStreamReaderTest")); ASSERT_TRUE(worker_thread_->Start()); diff --git a/chrome/browser/chromeos/drive/drive_integration_service.h b/chrome/browser/chromeos/drive/drive_integration_service.h index d60e4cc..8f6ad6d 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service.h +++ b/chrome/browser/chromeos/drive/drive_integration_service.h @@ -86,7 +86,7 @@ class DriveIntegrationService : public KeyedService, virtual ~DriveIntegrationService(); // KeyedService override: - virtual void Shutdown() OVERRIDE; + virtual 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; + virtual void OnNotificationReceived() override; + virtual void OnPushNotificationEnabled(bool enabled) override; EventLogger* event_logger() { return logger_.get(); } DriveServiceInterface* drive_service() { return drive_service_.get(); } @@ -155,7 +155,7 @@ class DriveIntegrationService : public KeyedService, // content::NotificationObserver overrides. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; friend class DriveIntegrationServiceFactory; @@ -226,9 +226,9 @@ class DriveIntegrationServiceFactory // BrowserContextKeyedServiceFactory overrides. virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; // This is static so it can be set without instantiating the factory. This // allows factory creation to be delayed until it normally happens (on profile diff --git a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc index b886726..d29d096 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc @@ -24,7 +24,7 @@ class DriveIntegrationServiceTest : public testing::Test { DriveIntegrationServiceTest() : profile_manager_(TestingBrowserProcess::GetGlobal()) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(profile_manager_.SetUp()); } diff --git a/chrome/browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc b/chrome/browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc index 3ce0b1b..b627c75 100644 --- a/chrome/browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc +++ b/chrome/browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc @@ -20,7 +20,7 @@ namespace drive { class DriveNotificationManagerFactoryLoginScreenBrowserTest : public InProcessBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kLoginManager); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); } @@ -39,7 +39,7 @@ IN_PROC_BROWSER_TEST_F(DriveNotificationManagerFactoryLoginScreenBrowserTest, class DriveNotificationManagerFactoryGuestBrowserTest : public InProcessBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kGuestSession); command_line->AppendSwitch(::switches::kIncognito); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); diff --git a/chrome/browser/chromeos/drive/dummy_file_system.h b/chrome/browser/chromeos/drive/dummy_file_system.h index 219314b..41661a8 100644 --- a/chrome/browser/chromeos/drive/dummy_file_system.h +++ b/chrome/browser/chromeos/drive/dummy_file_system.h @@ -13,92 +13,92 @@ namespace drive { class DummyFileSystem : public FileSystemInterface { public: virtual ~DummyFileSystem() {} - virtual void AddObserver(FileSystemObserver* observer) OVERRIDE {} - virtual void RemoveObserver(FileSystemObserver* observer) OVERRIDE {} - virtual void CheckForUpdates() OVERRIDE {} + virtual void AddObserver(FileSystemObserver* observer) override {} + virtual void RemoveObserver(FileSystemObserver* observer) override {} + virtual void CheckForUpdates() override {} virtual void TransferFileFromLocalToRemote( const base::FilePath& local_src_file_path, const base::FilePath& remote_dest_file_path, - const FileOperationCallback& callback) OVERRIDE {} + const FileOperationCallback& callback) override {} virtual void OpenFile(const base::FilePath& file_path, OpenMode open_mode, const std::string& mime_type, - const OpenFileCallback& callback) OVERRIDE {} + const OpenFileCallback& callback) override {} virtual void Copy(const base::FilePath& src_file_path, const base::FilePath& dest_file_path, bool preserve_last_modified, - const FileOperationCallback& callback) OVERRIDE {} + const FileOperationCallback& callback) override {} virtual void Move(const base::FilePath& src_file_path, const base::FilePath& dest_file_path, - const FileOperationCallback& callback) OVERRIDE {} + const FileOperationCallback& callback) override {} virtual void Remove(const base::FilePath& file_path, bool is_recursive, - const FileOperationCallback& callback) OVERRIDE {} + const FileOperationCallback& callback) override {} virtual void CreateDirectory( const base::FilePath& directory_path, bool is_exclusive, bool is_recursive, - const FileOperationCallback& callback) OVERRIDE {} + const FileOperationCallback& callback) override {} virtual void CreateFile(const base::FilePath& file_path, bool is_exclusive, const std::string& mime_type, - const FileOperationCallback& callback) OVERRIDE {} + const FileOperationCallback& callback) override {} virtual void TouchFile(const base::FilePath& file_path, const base::Time& last_access_time, const base::Time& last_modified_time, - const FileOperationCallback& callback) OVERRIDE {} + const FileOperationCallback& callback) override {} virtual void TruncateFile(const base::FilePath& file_path, int64 length, - const FileOperationCallback& callback) OVERRIDE {} + const FileOperationCallback& callback) override {} virtual void Pin(const base::FilePath& file_path, - const FileOperationCallback& callback) OVERRIDE {} + const FileOperationCallback& callback) override {} virtual void Unpin(const base::FilePath& file_path, - const FileOperationCallback& callback) OVERRIDE {} + const FileOperationCallback& callback) override {} virtual void GetFile(const base::FilePath& file_path, - const GetFileCallback& callback) OVERRIDE {} + const GetFileCallback& callback) override {} virtual void GetFileForSaving(const base::FilePath& file_path, - const GetFileCallback& callback) OVERRIDE {} + const GetFileCallback& callback) override {} virtual base::Closure GetFileContent( const base::FilePath& file_path, const GetFileContentInitializedCallback& initialized_callback, const google_apis::GetContentCallback& get_content_callback, - const FileOperationCallback& completion_callback) OVERRIDE; + const FileOperationCallback& completion_callback) override; virtual void GetResourceEntry( const base::FilePath& file_path, - const GetResourceEntryCallback& callback) OVERRIDE {} + const GetResourceEntryCallback& callback) override {} virtual void ReadDirectory( const base::FilePath& file_path, const ReadDirectoryEntriesCallback& entries_callback, - const FileOperationCallback& completion_callback) OVERRIDE {} + const FileOperationCallback& completion_callback) override {} virtual void Search(const std::string& search_query, const GURL& next_link, - const SearchCallback& callback) OVERRIDE {} + const SearchCallback& callback) override {} virtual void SearchMetadata( const std::string& query, int options, int at_most_num_matches, - const SearchMetadataCallback& callback) OVERRIDE {} + const SearchMetadataCallback& callback) override {} virtual void GetAvailableSpace( - const GetAvailableSpaceCallback& callback) OVERRIDE {} + const GetAvailableSpaceCallback& callback) override {} virtual void GetShareUrl(const base::FilePath& file_path, const GURL& embed_origin, - const GetShareUrlCallback& callback) OVERRIDE {} + const GetShareUrlCallback& callback) override {} virtual void GetMetadata( - const GetFilesystemMetadataCallback& callback) OVERRIDE {} + const GetFilesystemMetadataCallback& callback) override {} virtual void MarkCacheFileAsMounted( const base::FilePath& drive_file_path, - const MarkMountedCallback& callback) OVERRIDE {} + const MarkMountedCallback& callback) override {} virtual void MarkCacheFileAsUnmounted( const base::FilePath& cache_file_path, - const FileOperationCallback& callback) OVERRIDE {} + const FileOperationCallback& callback) override {} virtual void AddPermission(const base::FilePath& drive_file_path, const std::string& email, google_apis::drive::PermissionRole role, - const FileOperationCallback& callback) OVERRIDE {} - virtual void Reset(const FileOperationCallback& callback) OVERRIDE {} + const FileOperationCallback& callback) override {} + virtual void Reset(const FileOperationCallback& callback) override {} virtual void GetPathFromResourceId(const std::string& resource_id, const GetFilePathCallback& callback) - OVERRIDE {} + override {} }; } // namespace drive diff --git a/chrome/browser/chromeos/drive/fake_file_system.h b/chrome/browser/chromeos/drive/fake_file_system.h index 5625cca..a32a8fa 100644 --- a/chrome/browser/chromeos/drive/fake_file_system.h +++ b/chrome/browser/chromeos/drive/fake_file_system.h @@ -42,91 +42,91 @@ class FakeFileSystem : public FileSystemInterface { virtual ~FakeFileSystem(); // FileSystemInterface Overrides. - virtual void AddObserver(FileSystemObserver* observer) OVERRIDE; - virtual void RemoveObserver(FileSystemObserver* observer) OVERRIDE; - virtual void CheckForUpdates() OVERRIDE; + virtual void AddObserver(FileSystemObserver* observer) override; + virtual void RemoveObserver(FileSystemObserver* observer) override; + virtual void CheckForUpdates() override; virtual void TransferFileFromLocalToRemote( const base::FilePath& local_src_file_path, const base::FilePath& remote_dest_file_path, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void OpenFile(const base::FilePath& file_path, OpenMode open_mode, const std::string& mime_type, - const OpenFileCallback& callback) OVERRIDE; + const OpenFileCallback& callback) override; virtual void Copy(const base::FilePath& src_file_path, const base::FilePath& dest_file_path, bool preserve_last_modified, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void Move(const base::FilePath& src_file_path, const base::FilePath& dest_file_path, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void Remove(const base::FilePath& file_path, bool is_recursive, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void CreateDirectory(const base::FilePath& directory_path, bool is_exclusive, bool is_recursive, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void CreateFile(const base::FilePath& file_path, bool is_exclusive, const std::string& mime_type, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void TouchFile(const base::FilePath& file_path, const base::Time& last_access_time, const base::Time& last_modified_time, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void TruncateFile(const base::FilePath& file_path, int64 length, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void Pin(const base::FilePath& file_path, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void Unpin(const base::FilePath& file_path, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void GetFile(const base::FilePath& file_path, - const GetFileCallback& callback) OVERRIDE; + const GetFileCallback& callback) override; virtual void GetFileForSaving(const base::FilePath& file_path, - const GetFileCallback& callback) OVERRIDE; + const GetFileCallback& callback) override; virtual base::Closure GetFileContent( const base::FilePath& file_path, const GetFileContentInitializedCallback& initialized_callback, const google_apis::GetContentCallback& get_content_callback, - const FileOperationCallback& completion_callback) OVERRIDE; + const FileOperationCallback& completion_callback) override; virtual void GetResourceEntry( const base::FilePath& file_path, - const GetResourceEntryCallback& callback) OVERRIDE; + const GetResourceEntryCallback& callback) override; virtual void ReadDirectory( const base::FilePath& file_path, const ReadDirectoryEntriesCallback& entries_callback, - const FileOperationCallback& completion_callback) OVERRIDE; + const FileOperationCallback& completion_callback) override; virtual void Search(const std::string& search_query, const GURL& next_link, - const SearchCallback& callback) OVERRIDE; + const SearchCallback& callback) override; virtual void SearchMetadata(const std::string& query, int options, int at_most_num_matches, - const SearchMetadataCallback& callback) OVERRIDE; + const SearchMetadataCallback& callback) override; virtual void GetAvailableSpace( - const GetAvailableSpaceCallback& callback) OVERRIDE; + const GetAvailableSpaceCallback& callback) override; virtual void GetShareUrl( const base::FilePath& file_path, const GURL& embed_origin, - const GetShareUrlCallback& callback) OVERRIDE; + const GetShareUrlCallback& callback) override; virtual void GetMetadata( - const GetFilesystemMetadataCallback& callback) OVERRIDE; + const GetFilesystemMetadataCallback& callback) override; virtual void MarkCacheFileAsMounted( const base::FilePath& drive_file_path, - const MarkMountedCallback& callback) OVERRIDE; + const MarkMountedCallback& callback) override; virtual void MarkCacheFileAsUnmounted( const base::FilePath& cache_file_path, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void AddPermission(const base::FilePath& drive_file_path, const std::string& email, google_apis::drive::PermissionRole role, - const FileOperationCallback& callback) OVERRIDE; - virtual void Reset(const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; + virtual void Reset(const FileOperationCallback& callback) override; virtual void GetPathFromResourceId(const std::string& resource_id, const GetFilePathCallback& callback) - OVERRIDE; + override; private: // Helpers of GetFileContent. diff --git a/chrome/browser/chromeos/drive/fake_file_system_unittest.cc b/chrome/browser/chromeos/drive/fake_file_system_unittest.cc index 63b8bdb..5e5a1ef 100644 --- a/chrome/browser/chromeos/drive/fake_file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/fake_file_system_unittest.cc @@ -18,7 +18,7 @@ namespace test_util { class FakeFileSystemTest : public ::testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Initialize FakeDriveService. fake_drive_service_.reset(new FakeDriveService); ASSERT_TRUE(SetUpTestEntries(fake_drive_service_.get())); diff --git a/chrome/browser/chromeos/drive/fake_free_disk_space_getter.h b/chrome/browser/chromeos/drive/fake_free_disk_space_getter.h index 0d95b5f..c4504bb 100644 --- a/chrome/browser/chromeos/drive/fake_free_disk_space_getter.h +++ b/chrome/browser/chromeos/drive/fake_free_disk_space_getter.h @@ -30,7 +30,7 @@ class FakeFreeDiskSpaceGetter : public internal::FreeDiskSpaceGetterInterface { void PushFakeValue(int64 value); // FreeDiskSpaceGetterInterface overrides. - virtual int64 AmountOfFreeDiskSpace() OVERRIDE; + virtual int64 AmountOfFreeDiskSpace() override; private: std::list<int64> fake_values_; diff --git a/chrome/browser/chromeos/drive/file_cache_unittest.cc b/chrome/browser/chromeos/drive/file_cache_unittest.cc index 02b9008..10c0baf 100644 --- a/chrome/browser/chromeos/drive/file_cache_unittest.cc +++ b/chrome/browser/chromeos/drive/file_cache_unittest.cc @@ -33,7 +33,7 @@ const char kCacheFileDirectory[] = "files"; // Tests FileCache methods working with the blocking task runner. class FileCacheTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); const base::FilePath metadata_dir = temp_dir_.path().AppendASCII("meta"); cache_files_dir_ = temp_dir_.path().AppendASCII(kCacheFileDirectory); diff --git a/chrome/browser/chromeos/drive/file_system.h b/chrome/browser/chromeos/drive/file_system.h index 05d7510..f2fcde7 100644 --- a/chrome/browser/chromeos/drive/file_system.h +++ b/chrome/browser/chromeos/drive/file_system.h @@ -75,109 +75,109 @@ class FileSystem : public FileSystemInterface, virtual ~FileSystem(); // FileSystemInterface overrides. - virtual void AddObserver(FileSystemObserver* observer) OVERRIDE; - virtual void RemoveObserver(FileSystemObserver* observer) OVERRIDE; - virtual void CheckForUpdates() OVERRIDE; + virtual void AddObserver(FileSystemObserver* observer) override; + virtual void RemoveObserver(FileSystemObserver* observer) override; + virtual void CheckForUpdates() override; virtual void Search(const std::string& search_query, const GURL& next_link, - const SearchCallback& callback) OVERRIDE; + const SearchCallback& callback) override; virtual void SearchMetadata(const std::string& query, int options, int at_most_num_matches, - const SearchMetadataCallback& callback) OVERRIDE; + const SearchMetadataCallback& callback) override; virtual void TransferFileFromLocalToRemote( const base::FilePath& local_src_file_path, const base::FilePath& remote_dest_file_path, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void OpenFile(const base::FilePath& file_path, OpenMode open_mode, const std::string& mime_type, - const OpenFileCallback& callback) OVERRIDE; + const OpenFileCallback& callback) override; virtual void Copy(const base::FilePath& src_file_path, const base::FilePath& dest_file_path, bool preserve_last_modified, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void Move(const base::FilePath& src_file_path, const base::FilePath& dest_file_path, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void Remove(const base::FilePath& file_path, bool is_recursive, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void CreateDirectory(const base::FilePath& directory_path, bool is_exclusive, bool is_recursive, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void CreateFile(const base::FilePath& file_path, bool is_exclusive, const std::string& mime_type, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void TouchFile(const base::FilePath& file_path, const base::Time& last_access_time, const base::Time& last_modified_time, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void TruncateFile(const base::FilePath& file_path, int64 length, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void Pin(const base::FilePath& file_path, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void Unpin(const base::FilePath& file_path, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void GetFile(const base::FilePath& file_path, - const GetFileCallback& callback) OVERRIDE; + const GetFileCallback& callback) override; virtual void GetFileForSaving(const base::FilePath& file_path, - const GetFileCallback& callback) OVERRIDE; + const GetFileCallback& callback) override; virtual base::Closure GetFileContent( const base::FilePath& file_path, const GetFileContentInitializedCallback& initialized_callback, const google_apis::GetContentCallback& get_content_callback, - const FileOperationCallback& completion_callback) OVERRIDE; + const FileOperationCallback& completion_callback) override; virtual void GetResourceEntry( const base::FilePath& file_path, - const GetResourceEntryCallback& callback) OVERRIDE; + const GetResourceEntryCallback& callback) override; virtual void ReadDirectory( const base::FilePath& directory_path, const ReadDirectoryEntriesCallback& entries_callback, - const FileOperationCallback& completion_callback) OVERRIDE; + const FileOperationCallback& completion_callback) override; virtual void GetAvailableSpace( - const GetAvailableSpaceCallback& callback) OVERRIDE; + const GetAvailableSpaceCallback& callback) override; virtual void GetShareUrl( const base::FilePath& file_path, const GURL& embed_origin, - const GetShareUrlCallback& callback) OVERRIDE; + const GetShareUrlCallback& callback) override; virtual void GetMetadata( - const GetFilesystemMetadataCallback& callback) OVERRIDE; + const GetFilesystemMetadataCallback& callback) override; virtual void MarkCacheFileAsMounted( const base::FilePath& drive_file_path, - const MarkMountedCallback& callback) OVERRIDE; + const MarkMountedCallback& callback) override; virtual void MarkCacheFileAsUnmounted( const base::FilePath& cache_file_path, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; virtual void AddPermission(const base::FilePath& drive_file_path, const std::string& email, google_apis::drive::PermissionRole role, - const FileOperationCallback& callback) OVERRIDE; - virtual void Reset(const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; + virtual void Reset(const FileOperationCallback& callback) override; virtual void GetPathFromResourceId(const std::string& resource_id, const GetFilePathCallback& callback) - OVERRIDE; + override; // file_system::OperationDelegate overrides. virtual void OnFileChangedByOperation( - const FileChange& changed_files) OVERRIDE; - virtual void OnEntryUpdatedByOperation(const std::string& local_id) OVERRIDE; + const FileChange& changed_files) override; + virtual void OnEntryUpdatedByOperation(const std::string& local_id) override; virtual void OnDriveSyncError(file_system::DriveSyncErrorType type, - const std::string& local_id) OVERRIDE; + const std::string& local_id) override; virtual bool WaitForSyncComplete( const std::string& local_id, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; // ChangeListLoader::Observer overrides. // Used to propagate events from ChangeListLoader. virtual void OnDirectoryReloaded( - const base::FilePath& directory_path) OVERRIDE; - virtual void OnFileChanged(const FileChange& changed_files) OVERRIDE; - virtual void OnLoadFromServerComplete() OVERRIDE; - virtual void OnInitialLoadComplete() OVERRIDE; + const base::FilePath& directory_path) override; + virtual void OnFileChanged(const FileChange& changed_files) override; + virtual void OnLoadFromServerComplete() override; + virtual void OnInitialLoadComplete() override; // Used by tests. internal::ChangeListLoader* change_list_loader_for_testing() { diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc index 8513cdc..bf0a542 100644 --- a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc @@ -37,7 +37,7 @@ bool CopyWaitForSyncCompleteArguments(std::string* out_local_id, class CopyOperationTest : public OperationTestBase { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { OperationTestBase::SetUp(); operation_.reset(new CopyOperation( blocking_task_runner(), delegate(), scheduler(), metadata(), cache())); diff --git a/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc index 00b21c3..af90887 100644 --- a/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc @@ -23,7 +23,7 @@ namespace file_system { class DownloadOperationTest : public OperationTestBase { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { OperationTestBase::SetUp(); operation_.reset(new DownloadOperation( diff --git a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc index 33afb12..cf2ee00 100644 --- a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc @@ -36,7 +36,7 @@ class TestDelegate : public OperationDelegate { } // OperationDelegate overrides. - virtual void OnEntryUpdatedByOperation(const std::string& local_id) OVERRIDE { + virtual void OnEntryUpdatedByOperation(const std::string& local_id) override { updated_local_id_ = local_id; if (!quit_closure_.is_null()) quit_closure_.Run(); @@ -56,7 +56,7 @@ class GetFileForSavingOperationTest : public OperationTestBase { : OperationTestBase(content::TestBrowserThreadBundle::IO_MAINLOOP) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { OperationTestBase::SetUp(); operation_.reset(new GetFileForSavingOperation( diff --git a/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc index 9ea476f..ff5d367 100644 --- a/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc @@ -15,7 +15,7 @@ namespace file_system { class MoveOperationTest : public OperationTestBase { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { OperationTestBase::SetUp(); operation_.reset(new MoveOperation(blocking_task_runner(), delegate(), diff --git a/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc index 665d3e6..38d3916 100644 --- a/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc @@ -24,7 +24,7 @@ namespace file_system { class OpenFileOperationTest : public OperationTestBase { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { OperationTestBase::SetUp(); operation_.reset(new OpenFileOperation( diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.h b/chrome/browser/chromeos/drive/file_system/operation_test_base.h index 445be1a..e034245 100644 --- a/chrome/browser/chromeos/drive/file_system/operation_test_base.h +++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.h @@ -57,14 +57,14 @@ class OperationTestBase : public testing::Test { // OperationDelegate overrides. virtual void OnFileChangedByOperation( - const FileChange& changed_files) OVERRIDE; + const FileChange& changed_files) override; virtual void OnEntryUpdatedByOperation( - const std::string& local_id) OVERRIDE; + const std::string& local_id) override; virtual void OnDriveSyncError(DriveSyncErrorType type, - const std::string& local_id) OVERRIDE; + const std::string& local_id) override; virtual bool WaitForSyncComplete( const std::string& local_id, - const FileOperationCallback& callback) OVERRIDE; + const FileOperationCallback& callback) override; // Gets the set of changed paths. const FileChange& get_changed_files() { return changed_files_; } @@ -97,7 +97,7 @@ class OperationTestBase : public testing::Test { virtual ~OperationTestBase(); // testing::Test overrides. - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; // Returns the path of the temporary directory for putting test files. base::FilePath temp_dir() const { return temp_dir_.path(); } diff --git a/chrome/browser/chromeos/drive/file_system/truncate_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/truncate_operation_unittest.cc index 19de93d..10e865f 100644 --- a/chrome/browser/chromeos/drive/file_system/truncate_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/truncate_operation_unittest.cc @@ -18,7 +18,7 @@ namespace file_system { class TruncateOperationTest : public OperationTestBase { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { OperationTestBase::SetUp(); operation_.reset(new TruncateOperation( diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc index bdd61ff..aa50c3b 100644 --- a/chrome/browser/chromeos/drive/file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_unittest.cc @@ -62,11 +62,11 @@ class MockDirectoryChangeObserver : public FileSystemObserver { // FileSystemObserver overrides. virtual void OnDirectoryChanged( - const base::FilePath& directory_path) OVERRIDE { + const base::FilePath& directory_path) override { changed_directories_.push_back(directory_path); } - virtual void OnFileChanged(const FileChange& new_file_change) OVERRIDE { + virtual void OnFileChanged(const FileChange& new_file_change) override { changed_files_.Apply(new_file_change); } @@ -86,7 +86,7 @@ class MockDirectoryChangeObserver : public FileSystemObserver { class FileSystemTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); pref_service_.reset(new TestingPrefServiceSimple); test_util::RegisterDrivePrefs(pref_service_->registry()); diff --git a/chrome/browser/chromeos/drive/file_system_util_unittest.cc b/chrome/browser/chromeos/drive/file_system_util_unittest.cc index 2fc31a9..ab83337 100644 --- a/chrome/browser/chromeos/drive/file_system_util_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_util_unittest.cc @@ -39,7 +39,7 @@ class ProfileRelatedFileSystemUtilTest : public testing::Test { : testing_profile_manager_(TestingBrowserProcess::GetGlobal()) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(testing_profile_manager_.SetUp()); } diff --git a/chrome/browser/chromeos/drive/file_task_executor.cc b/chrome/browser/chromeos/drive/file_task_executor.cc index 7aaf7d36..09e76f4 100644 --- a/chrome/browser/chromeos/drive/file_task_executor.cc +++ b/chrome/browser/chromeos/drive/file_task_executor.cc @@ -32,15 +32,15 @@ class FileTaskExecutorDelegateImpl : public FileTaskExecutorDelegate { explicit FileTaskExecutorDelegateImpl(Profile* profile) : profile_(profile) { } - virtual FileSystemInterface* GetFileSystem() OVERRIDE { + virtual FileSystemInterface* GetFileSystem() override { return util::GetFileSystemByProfile(profile_); } - virtual DriveServiceInterface* GetDriveService() OVERRIDE { + virtual DriveServiceInterface* GetDriveService() override { return util::GetDriveServiceByProfile(profile_); } - virtual void OpenBrowserWindow(const GURL& open_link) OVERRIDE { + virtual void OpenBrowserWindow(const GURL& open_link) override { chrome::ScopedTabbedBrowserDisplayer displayer( profile_, chrome::HOST_DESKTOP_TYPE_ASH); chrome::AddSelectedTabWithURL(displayer.browser(), open_link, diff --git a/chrome/browser/chromeos/drive/file_task_executor_unittest.cc b/chrome/browser/chromeos/drive/file_task_executor_unittest.cc index 5c1e2b9..7b7b5e1 100644 --- a/chrome/browser/chromeos/drive/file_task_executor_unittest.cc +++ b/chrome/browser/chromeos/drive/file_task_executor_unittest.cc @@ -32,15 +32,15 @@ class TestDelegate : public FileTaskExecutorDelegate { } // FileTaskExecutorDelegate overrides. - virtual FileSystemInterface* GetFileSystem() OVERRIDE { + virtual FileSystemInterface* GetFileSystem() override { return fake_file_system_.get(); } - virtual DriveServiceInterface* GetDriveService() OVERRIDE { + virtual DriveServiceInterface* GetDriveService() override { return fake_drive_service_.get(); } - virtual void OpenBrowserWindow(const GURL& open_link) OVERRIDE { + virtual void OpenBrowserWindow(const GURL& open_link) override { opend_urls_->insert(open_link.spec()); } diff --git a/chrome/browser/chromeos/drive/file_write_watcher_unittest.cc b/chrome/browser/chromeos/drive/file_write_watcher_unittest.cc index 036aa2b..8c2bcda 100644 --- a/chrome/browser/chromeos/drive/file_write_watcher_unittest.cc +++ b/chrome/browser/chromeos/drive/file_write_watcher_unittest.cc @@ -63,7 +63,7 @@ class FileWriteWatcherTest : public testing::Test { : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); } diff --git a/chrome/browser/chromeos/drive/fileapi/async_file_util.h b/chrome/browser/chromeos/drive/fileapi/async_file_util.h index 20e879d..02d8b0f 100644 --- a/chrome/browser/chromeos/drive/fileapi/async_file_util.h +++ b/chrome/browser/chromeos/drive/fileapi/async_file_util.h @@ -26,68 +26,68 @@ class AsyncFileUtil : public storage::AsyncFileUtil { scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, int file_flags, - const CreateOrOpenCallback& callback) OVERRIDE; + const CreateOrOpenCallback& callback) override; virtual void EnsureFileExists( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const EnsureFileExistsCallback& callback) OVERRIDE; + const EnsureFileExistsCallback& callback) override; virtual void CreateDirectory( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, bool exclusive, bool recursive, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void GetFileInfo( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const GetFileInfoCallback& callback) OVERRIDE; + const GetFileInfoCallback& callback) override; virtual void ReadDirectory( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const ReadDirectoryCallback& callback) OVERRIDE; + const ReadDirectoryCallback& callback) override; virtual void Touch(scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, const base::Time& last_access_time, const base::Time& last_modified_time, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void Truncate(scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, int64 length, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void CopyFileLocal( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& src_url, const storage::FileSystemURL& dest_url, CopyOrMoveOption option, const CopyFileProgressCallback& progress_callback, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void MoveFileLocal( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& src_url, const storage::FileSystemURL& dest_url, CopyOrMoveOption option, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void CopyInForeignFile( scoped_ptr<storage::FileSystemOperationContext> context, const base::FilePath& src_file_path, const storage::FileSystemURL& dest_url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void DeleteFile( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void DeleteDirectory( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void DeleteRecursively( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void CreateSnapshotFile( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const CreateSnapshotFileCallback& callback) OVERRIDE; + const CreateSnapshotFileCallback& callback) override; private: DISALLOW_COPY_AND_ASSIGN(AsyncFileUtil); diff --git a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h index 1bc2a46..aab1217b 100644 --- a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h +++ b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h @@ -29,22 +29,22 @@ class FileSystemBackendDelegate : public chromeos::FileSystemBackendDelegate { // FileSystemBackend::Delegate overrides. virtual storage::AsyncFileUtil* GetAsyncFileUtil( - storage::FileSystemType type) OVERRIDE; + storage::FileSystemType type) override; virtual scoped_ptr<storage::FileStreamReader> CreateFileStreamReader( const storage::FileSystemURL& url, int64 offset, int64 max_bytes_to_read, const base::Time& expected_modification_time, - storage::FileSystemContext* context) OVERRIDE; + storage::FileSystemContext* context) override; virtual scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter( const storage::FileSystemURL& url, int64 offset, - storage::FileSystemContext* context) OVERRIDE; + storage::FileSystemContext* context) override; virtual storage::WatcherManager* GetWatcherManager( - const storage::FileSystemURL& url) OVERRIDE; + const storage::FileSystemURL& url) override; virtual void GetRedirectURLForContents( const storage::FileSystemURL& url, - const storage::URLCallback& callback) OVERRIDE; + const storage::URLCallback& callback) override; private: scoped_ptr<storage::AsyncFileUtil> async_file_util_; diff --git a/chrome/browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc b/chrome/browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc index 837f6b1..b004cff 100644 --- a/chrome/browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc +++ b/chrome/browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc @@ -43,7 +43,7 @@ class TestFileSystemForOpenFile : public DummyFileSystem { virtual void OpenFile(const base::FilePath& file_path, OpenMode open_mode, const std::string& mime_type, - const drive::OpenFileCallback& callback) OVERRIDE { + const drive::OpenFileCallback& callback) override { EXPECT_EQ(expected_open_mode_, open_mode); callback.Run( diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h index ca6d05f..ae18d38 100644 --- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h +++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h @@ -43,9 +43,9 @@ class WebkitFileStreamReaderImpl : public storage::FileStreamReader { // storage::FileStreamReader override. virtual int Read(net::IOBuffer* buffer, int buffer_length, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int64 GetLength(const net::Int64CompletionCallback& callback) - OVERRIDE; + override; private: // Called upon the initialization completion of |stream_reader_|. diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc index 8fb9881..dd0420f 100644 --- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc +++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc @@ -37,7 +37,7 @@ class WebkitFileStreamReaderImplTest : public ::testing::Test { : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { worker_thread_.reset(new base::Thread("WebkitFileStreamReaderImplTest")); ASSERT_TRUE(worker_thread_->Start()); diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h index 9be10c9..19bbad0 100644 --- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h +++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h @@ -48,9 +48,9 @@ class WebkitFileStreamWriterImpl : public storage::FileStreamWriter { // FileWriter override. virtual int Write(net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE; - virtual int Cancel(const net::CompletionCallback& callback) OVERRIDE; - virtual int Flush(const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; + virtual int Cancel(const net::CompletionCallback& callback) override; + virtual int Flush(const net::CompletionCallback& callback) override; private: // Part of Write(). Called after CreateWritableSnapshotFile is completed. diff --git a/chrome/browser/chromeos/drive/job_scheduler.h b/chrome/browser/chromeos/drive/job_scheduler.h index cd21030..122ed5c 100644 --- a/chrome/browser/chromeos/drive/job_scheduler.h +++ b/chrome/browser/chromeos/drive/job_scheduler.h @@ -69,11 +69,11 @@ class JobScheduler virtual ~JobScheduler(); // JobListInterface overrides. - virtual std::vector<JobInfo> GetJobInfoList() OVERRIDE; - virtual void AddObserver(JobListObserver* observer) OVERRIDE; - virtual void RemoveObserver(JobListObserver* observer) OVERRIDE; - virtual void CancelJob(JobID job_id) OVERRIDE; - virtual void CancelAllJobs() OVERRIDE; + virtual std::vector<JobInfo> GetJobInfoList() override; + virtual void AddObserver(JobListObserver* observer) override; + virtual void RemoveObserver(JobListObserver* observer) override; + virtual void CancelJob(JobID job_id) override; + virtual void CancelAllJobs() override; // Adds a GetAppList operation to the queue. // |callback| must not be null. @@ -342,7 +342,7 @@ class JobScheduler // net::NetworkChangeNotifier::ConnectionTypeObserver override. virtual void OnConnectionTypeChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; // Get the type of queue the specified job should be put in. QueueType GetJobQueueType(JobType type); diff --git a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc index 6ec1e71..37bce50 100644 --- a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc +++ b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc @@ -71,15 +71,15 @@ class JobListLogger : public JobListObserver { } // JobListObserver overrides. - virtual void OnJobAdded(const JobInfo& info) OVERRIDE { + virtual void OnJobAdded(const JobInfo& info) override { events.push_back(EventLog(ADDED, info)); } - virtual void OnJobUpdated(const JobInfo& info) OVERRIDE { + virtual void OnJobUpdated(const JobInfo& info) override { events.push_back(EventLog(UPDATED, info)); } - virtual void OnJobDone(const JobInfo& info, FileError error) OVERRIDE { + virtual void OnJobDone(const JobInfo& info, FileError error) override { events.push_back(EventLog(DONE, info)); } @@ -107,7 +107,7 @@ class CancelTestableFakeDriveService : public FakeDriveService { const std::string& parent_resource_id, const std::string& title, const InitiateUploadNewFileOptions& options, - const google_apis::InitiateUploadCallback& callback) OVERRIDE { + const google_apis::InitiateUploadCallback& callback) override { if (upload_new_file_cancelable_) return base::Bind(callback, google_apis::GDATA_CANCELLED, GURL()); @@ -132,7 +132,7 @@ class JobSchedulerTest : public testing::Test { test_util::RegisterDrivePrefs(pref_service_->registry()); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { fake_network_change_notifier_.reset( new test_util::FakeNetworkChangeNotifier); diff --git a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc b/chrome/browser/chromeos/drive/local_file_reader_unittest.cc index 414b437..54f2bc3 100644 --- a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/local_file_reader_unittest.cc @@ -44,7 +44,7 @@ class LocalFileReaderAdapter { class LocalFileReaderTest : public ::testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); worker_thread_.reset(new base::Thread("LocalFileReaderTest")); ASSERT_TRUE(worker_thread_->Start()); diff --git a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc index d095dbe..1848ddb1 100644 --- a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc +++ b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc @@ -23,7 +23,7 @@ namespace internal { class RemoveStaleCacheFilesTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter); diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc index ceea737d..9180f4e 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc @@ -21,7 +21,7 @@ namespace internal { class ResourceMetadataStorageTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); storage_.reset(new ResourceMetadataStorage( diff --git a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc index 440aed9..eefba5a 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc @@ -134,7 +134,7 @@ void SetUpEntries(ResourceMetadata* resource_metadata) { // Tests for methods running on the blocking task runner. class ResourceMetadataTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); metadata_storage_.reset(new ResourceMetadataStorage( diff --git a/chrome/browser/chromeos/drive/search_metadata_unittest.cc b/chrome/browser/chromeos/drive/search_metadata_unittest.cc index 5dfa628..aeec016 100644 --- a/chrome/browser/chromeos/drive/search_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/search_metadata_unittest.cc @@ -40,7 +40,7 @@ bool FindAndHighlightWrapper( class SearchMetadataTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter); diff --git a/chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc b/chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc index 3b04b14..2d27f1b 100644 --- a/chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc +++ b/chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc @@ -20,7 +20,7 @@ namespace internal { class EntryRevertPerformerTest : public file_system::OperationTestBase { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { OperationTestBase::SetUp(); performer_.reset(new EntryRevertPerformer(blocking_task_runner(), delegate(), diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc b/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc index fad47e4..b278ff6 100644 --- a/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc +++ b/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc @@ -25,7 +25,7 @@ namespace internal { class EntryUpdatePerformerTest : public file_system::OperationTestBase { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { OperationTestBase::SetUp(); performer_.reset(new EntryUpdatePerformer(blocking_task_runner(), delegate(), diff --git a/chrome/browser/chromeos/drive/sync_client_unittest.cc b/chrome/browser/chromeos/drive/sync_client_unittest.cc index b0f516e..a92999b 100644 --- a/chrome/browser/chromeos/drive/sync_client_unittest.cc +++ b/chrome/browser/chromeos/drive/sync_client_unittest.cc @@ -54,7 +54,7 @@ class SyncClientTestDriveService : public ::drive::FakeDriveService { const std::string& resource_id, const google_apis::DownloadActionCallback& download_action_callback, const google_apis::GetContentCallback& get_content_callback, - const google_apis::ProgressCallback& progress_callback) OVERRIDE { + const google_apis::ProgressCallback& progress_callback) override { ++download_file_count_; if (resource_id == resource_id_to_be_cancelled_) { base::MessageLoopProxy::current()->PostTask( @@ -100,7 +100,7 @@ class SyncClientTestDriveService : public ::drive::FakeDriveService { class SyncClientTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); pref_service_.reset(new TestingPrefServiceSimple); diff --git a/chrome/browser/chromeos/drive/test_util.h b/chrome/browser/chromeos/drive/test_util.h index d69d441..ac2deb5 100644 --- a/chrome/browser/chromeos/drive/test_util.h +++ b/chrome/browser/chromeos/drive/test_util.h @@ -72,7 +72,7 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier { void SetConnectionType(ConnectionType type); // NetworkChangeNotifier override. - virtual ConnectionType GetCurrentConnectionType() const OVERRIDE; + virtual ConnectionType GetCurrentConnectionType() const override; private: net::NetworkChangeNotifier::ConnectionType type_; diff --git a/chrome/browser/chromeos/drive/write_on_cache_file_unittest.cc b/chrome/browser/chromeos/drive/write_on_cache_file_unittest.cc index d277cf1..da1bb37 100644 --- a/chrome/browser/chromeos/drive/write_on_cache_file_unittest.cc +++ b/chrome/browser/chromeos/drive/write_on_cache_file_unittest.cc @@ -33,7 +33,7 @@ class TestFileSystem : public DummyFileSystem { virtual void OpenFile(const base::FilePath& file_path, OpenMode open_mode, const std::string& mime_type, - const OpenFileCallback& callback) OVERRIDE { + const OpenFileCallback& callback) override { EXPECT_EQ(OPEN_OR_CREATE_FILE, open_mode); // Emulate a case of opening a hosted document. diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc index ac22596..5f81a14 100644 --- a/chrome/browser/chromeos/enrollment_dialog_view.cc +++ b/chrome/browser/chromeos/enrollment_dialog_view.cc @@ -49,18 +49,18 @@ class EnrollmentDialogView : public views::DialogDelegateView { const base::Closure& connect); // views::DialogDelegateView overrides - virtual int GetDialogButtons() const OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual void OnClosed() OVERRIDE; + virtual int GetDialogButtons() const override; + virtual bool Accept() override; + virtual void OnClosed() override; virtual base::string16 GetDialogButtonLabel( - ui::DialogButton button) const OVERRIDE; + ui::DialogButton button) const override; // views::WidgetDelegate overrides - virtual ui::ModalType GetModalType() const OVERRIDE; - virtual base::string16 GetWindowTitle() const OVERRIDE; + virtual ui::ModalType GetModalType() const override; + virtual base::string16 GetWindowTitle() const override; // views::View overrides - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; private: EnrollmentDialogView(const std::string& network_name, diff --git a/chrome/browser/chromeos/events/event_rewriter.h b/chrome/browser/chromeos/events/event_rewriter.h index 284265d..aae5de0 100644 --- a/chrome/browser/chromeos/events/event_rewriter.h +++ b/chrome/browser/chromeos/events/event_rewriter.h @@ -75,10 +75,10 @@ class EventRewriter : public ui::EventRewriter { // EventRewriter overrides: virtual ui::EventRewriteStatus RewriteEvent( const ui::Event& event, - scoped_ptr<ui::Event>* rewritten_event) OVERRIDE; + scoped_ptr<ui::Event>* rewritten_event) override; virtual ui::EventRewriteStatus NextDispatchEvent( const ui::Event& last_event, - scoped_ptr<ui::Event>* new_event) OVERRIDE; + scoped_ptr<ui::Event>* new_event) override; // Generate a new key event from an original key event and the replacement // key code and flags determined by a key rewriter. diff --git a/chrome/browser/chromeos/events/event_rewriter_controller.h b/chrome/browser/chromeos/events/event_rewriter_controller.h index 76111bb..2442bc8 100644 --- a/chrome/browser/chromeos/events/event_rewriter_controller.h +++ b/chrome/browser/chromeos/events/event_rewriter_controller.h @@ -35,8 +35,8 @@ class EventRewriterController : public aura::EnvObserver { void Init(); // aura::EnvObserver overrides: - virtual void OnWindowInitialized(aura::Window* window) OVERRIDE {} - virtual void OnHostInitialized(aura::WindowTreeHost* host) OVERRIDE; + virtual void OnWindowInitialized(aura::Window* window) override {} + virtual void OnHostInitialized(aura::WindowTreeHost* host) override; private: typedef std::list<ui::EventSource*> EventSourceList; diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc index 261c837..a7be1dd 100644 --- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc +++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc @@ -1787,7 +1787,7 @@ class EventBuffer : public ui::test::TestEventProcessor { private: // ui::EventProcessor overrides: virtual ui::EventDispatchDetails OnEventFromSource( - ui::Event* event) OVERRIDE { + ui::Event* event) override { if (event->IsKeyEvent()) { events_.push_back(new ui::KeyEvent(*static_cast<ui::KeyEvent*>(event))); } else if (event->IsMouseWheelEvent()) { @@ -1810,7 +1810,7 @@ class TestEventSource : public ui::EventSource { public: explicit TestEventSource(ui::EventProcessor* processor) : processor_(processor) {} - virtual ui::EventProcessor* GetEventProcessor() OVERRIDE { + virtual ui::EventProcessor* GetEventProcessor() override { return processor_; } ui::EventDispatchDetails Send(ui::Event* event) { @@ -1857,7 +1857,7 @@ class EventRewriterAshTest : public ash::test::AshTestBase { buffer_.PopEvents(events); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); sticky_keys_controller_ = ash::Shell::GetInstance()->sticky_keys_controller(); @@ -1871,7 +1871,7 @@ class EventRewriterAshTest : public ash::test::AshTestBase { sticky_keys_controller_->Enable(true); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { rewriter_.reset(); AshTestBase::TearDown(); } @@ -2311,7 +2311,7 @@ class StickyKeysOverlayTest : public EventRewriterAshTest { virtual ~StickyKeysOverlayTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EventRewriterAshTest::SetUp(); overlay_ = sticky_keys_controller_->GetOverlayForTest(); ASSERT_TRUE(overlay_); diff --git a/chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h b/chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h index b9cbaa7..1c263ed 100644 --- a/chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h +++ b/chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h @@ -24,10 +24,10 @@ class KeyboardDrivenEventRewriter : public ui::EventRewriter { // EventRewriter overrides: virtual ui::EventRewriteStatus RewriteEvent( const ui::Event& event, - scoped_ptr<ui::Event>* new_event) OVERRIDE; + scoped_ptr<ui::Event>* new_event) override; virtual ui::EventRewriteStatus NextDispatchEvent( const ui::Event& last_event, - scoped_ptr<ui::Event>* new_event) OVERRIDE; + scoped_ptr<ui::Event>* new_event) override; private: ui::EventRewriteStatus Rewrite(const ui::Event& event, diff --git a/chrome/browser/chromeos/events/system_key_event_listener.h b/chrome/browser/chromeos/events/system_key_event_listener.h index 8e74d75..db52ee1 100644 --- a/chrome/browser/chromeos/events/system_key_event_listener.h +++ b/chrome/browser/chromeos/events/system_key_event_listener.h @@ -31,8 +31,8 @@ class SystemKeyEventListener : public ui::PlatformEventObserver { virtual ~SystemKeyEventListener(); // ui::PlatformEventObserver: - virtual void WillProcessEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual void DidProcessEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual void WillProcessEvent(const ui::PlatformEvent& event) override; + virtual void DidProcessEvent(const ui::PlatformEvent& event) override; void ProcessedXEvent(XEvent* xevent); diff --git a/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h b/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h index b36fa86..ecffc55 100644 --- a/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h +++ b/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h @@ -36,8 +36,8 @@ class XInputHierarchyChangedEventListener : public ui::PlatformEventObserver { virtual ~XInputHierarchyChangedEventListener(); // ui::PlatformEventObserver: - virtual void WillProcessEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual void DidProcessEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual void WillProcessEvent(const ui::PlatformEvent& event) override; + virtual void DidProcessEvent(const ui::PlatformEvent& event) override; // Returns true if the event was processed, false otherwise. void ProcessedXEvent(XEvent* xevent); diff --git a/chrome/browser/chromeos/extensions/default_app_order_unittest.cc b/chrome/browser/chromeos/extensions/default_app_order_unittest.cc index 1ba4549..50651d3 100644 --- a/chrome/browser/chromeos/extensions/default_app_order_unittest.cc +++ b/chrome/browser/chromeos/extensions/default_app_order_unittest.cc @@ -31,10 +31,10 @@ class DefaultAppOrderTest : public testing::Test { virtual ~DefaultAppOrderTest() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { default_app_order::Get(&built_in_default_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { } bool IsBuiltInDefault(const std::vector<std::string>& apps) { diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h index b70a689..f8f478a 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h +++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h @@ -48,15 +48,15 @@ class DeviceLocalAccountExternalPolicyLoader void StopCache(const base::Closure& callback); // extensions::ExternalLoader: - virtual void StartLoading() OVERRIDE; + virtual void StartLoading() override; // policy::CloudPolicyStore::Observer: - virtual void OnStoreLoaded(policy::CloudPolicyStore* store) OVERRIDE; - virtual void OnStoreError(policy::CloudPolicyStore* store) OVERRIDE; + virtual void OnStoreLoaded(policy::CloudPolicyStore* store) override; + virtual void OnStoreError(policy::CloudPolicyStore* store) override; // ExternalCache::Delegate: virtual void OnExtensionListsUpdated( - const base::DictionaryValue* prefs) OVERRIDE; + const base::DictionaryValue* prefs) override; ExternalCache* GetExternalCacheForTesting(); diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc index ecde290..bd206a9 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc +++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc @@ -97,8 +97,8 @@ class DeviceLocalAccountExternalPolicyLoaderTest : public testing::Test { DeviceLocalAccountExternalPolicyLoaderTest(); virtual ~DeviceLocalAccountExternalPolicyLoaderTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; void VerifyAndResetVisitorCallExpectations(); void SetForceInstallListPolicy(); diff --git a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h index 546f2c7..5aade9c 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h +++ b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h @@ -23,9 +23,9 @@ class DeviceLocalAccountManagementPolicyProvider virtual ~DeviceLocalAccountManagementPolicyProvider(); // extensions::ManagementPolicy::Provider: - virtual std::string GetDebugPolicyProviderName() const OVERRIDE; + virtual std::string GetDebugPolicyProviderName() const override; virtual bool UserMayLoad(const extensions::Extension* extension, - base::string16* error) const OVERRIDE; + base::string16* error) const override; private: const policy::DeviceLocalAccount::Type account_type_; diff --git a/chrome/browser/chromeos/extensions/echo_private_api.h b/chrome/browser/chromeos/extensions/echo_private_api.h index 20ea9ca..c120811 100644 --- a/chrome/browser/chromeos/extensions/echo_private_api.h +++ b/chrome/browser/chromeos/extensions/echo_private_api.h @@ -31,7 +31,7 @@ class EchoPrivateGetRegistrationCodeFunction protected: virtual ~EchoPrivateGetRegistrationCodeFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: void GetRegistrationCode(const std::string& type); @@ -46,7 +46,7 @@ class EchoPrivateGetOobeTimestampFunction protected: virtual ~EchoPrivateGetOobeTimestampFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: bool GetOobeTimestampOnFileThread(); @@ -60,7 +60,7 @@ class EchoPrivateSetOfferInfoFunction : public ChromeSyncExtensionFunction { protected: virtual ~EchoPrivateSetOfferInfoFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DECLARE_EXTENSION_FUNCTION("echoPrivate.setOfferInfo", @@ -73,7 +73,7 @@ class EchoPrivateGetOfferInfoFunction : public ChromeSyncExtensionFunction { protected: virtual ~EchoPrivateGetOfferInfoFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DECLARE_EXTENSION_FUNCTION("echoPrivate.getOfferInfo", @@ -102,13 +102,13 @@ class EchoPrivateGetUserConsentFunction : public ChromeAsyncExtensionFunction, protected: virtual ~EchoPrivateGetUserConsentFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // chromeos::EchoDialogListener overrides. - virtual void OnAccept() OVERRIDE; - virtual void OnCancel() OVERRIDE; - virtual void OnMoreInfoLinkClicked() OVERRIDE; + virtual void OnAccept() override; + virtual void OnCancel() override; + virtual void OnMoreInfoLinkClicked() override; // Checks whether "allow redeem ChromeOS registration offers" setting is // disabled in cros settings. It may be asynchronous if the needed settings diff --git a/chrome/browser/chromeos/extensions/echo_private_apitest.cc b/chrome/browser/chromeos/extensions/echo_private_apitest.cc index 4a6b1b3..dd37945 100644 --- a/chrome/browser/chromeos/extensions/echo_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/echo_private_apitest.cc @@ -34,7 +34,7 @@ class ExtensionEchoPrivateApiTest : public ExtensionApiTest { virtual ~ExtensionEchoPrivateApiTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); // Force usage of stub cros settings provider instead of device settings diff --git a/chrome/browser/chromeos/extensions/extension_system_event_observer.h b/chrome/browser/chromeos/extensions/extension_system_event_observer.h index d51dce0..d27cfae 100644 --- a/chrome/browser/chromeos/extensions/extension_system_event_observer.h +++ b/chrome/browser/chromeos/extensions/extension_system_event_observer.h @@ -21,11 +21,11 @@ class ExtensionSystemEventObserver : public PowerManagerClient::Observer, virtual ~ExtensionSystemEventObserver(); // PowerManagerClient::Observer overrides: - virtual void BrightnessChanged(int level, bool user_initiated) OVERRIDE; - virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE; + virtual void BrightnessChanged(int level, bool user_initiated) override; + virtual void SuspendDone(const base::TimeDelta& sleep_duration) override; // SessionManagerClient::Observer override. - virtual void ScreenIsUnlocked() OVERRIDE; + virtual void ScreenIsUnlocked() override; private: DISALLOW_COPY_AND_ASSIGN(ExtensionSystemEventObserver); diff --git a/chrome/browser/chromeos/extensions/external_cache.h b/chrome/browser/chromeos/extensions/external_cache.h index 52c2247..220426f 100644 --- a/chrome/browser/chromeos/extensions/external_cache.h +++ b/chrome/browser/chromeos/extensions/external_cache.h @@ -83,14 +83,14 @@ class ExternalCache : public content::NotificationObserver, // Implementation of content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Implementation of ExtensionDownloaderDelegate: virtual void OnExtensionDownloadFailed( const std::string& id, Error error, const PingResult& ping_result, - const std::set<int>& request_ids) OVERRIDE; + const std::set<int>& request_ids) override; virtual void OnExtensionDownloadFinished( const std::string& id, @@ -99,12 +99,12 @@ class ExternalCache : public content::NotificationObserver, const GURL& download_url, const std::string& version, const PingResult& ping_result, - const std::set<int>& request_ids) OVERRIDE; + const std::set<int>& request_ids) override; - virtual bool IsExtensionPending(const std::string& id) OVERRIDE; + virtual bool IsExtensionPending(const std::string& id) override; virtual bool GetExtensionExistingVersion(const std::string& id, - std::string* version) OVERRIDE; + std::string* version) override; // Shut down the cache. The |callback| will be invoked when the cache has shut // down completely and there are no more pending file I/O operations. diff --git a/chrome/browser/chromeos/extensions/external_cache_unittest.cc b/chrome/browser/chromeos/extensions/external_cache_unittest.cc index fcbb30e..9bec730 100644 --- a/chrome/browser/chromeos/extensions/external_cache_unittest.cc +++ b/chrome/browser/chromeos/extensions/external_cache_unittest.cc @@ -56,7 +56,7 @@ class ExternalCacheTest : public testing::Test, } // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { request_context_getter_ = new net::TestURLRequestContextGetter( content::BrowserThread::GetMessageLoopProxyForThread( content::BrowserThread::IO)); @@ -68,19 +68,19 @@ class ExternalCacheTest : public testing::Test, pool_owner_->pool()->GetNamedSequenceToken("background")); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { pool_owner_->pool()->Shutdown(); base::RunLoop().RunUntilIdle(); } // ExternalCache::Delegate: virtual void OnExtensionListsUpdated( - const base::DictionaryValue* prefs) OVERRIDE { + const base::DictionaryValue* prefs) override { prefs_.reset(prefs->DeepCopy()); } virtual std::string GetInstalledExtensionVersion( - const std::string& id) OVERRIDE { + const std::string& id) override { std::map<std::string, std::string>::iterator it = installed_extensions_.find(id); return it != installed_extensions_.end() ? it->second : std::string(); diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router.h b/chrome/browser/chromeos/extensions/file_manager/device_event_router.h index 5a16c2d..a43ced2 100644 --- a/chrome/browser/chromeos/extensions/file_manager/device_event_router.h +++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router.h @@ -42,23 +42,23 @@ class DeviceEventRouter : public VolumeManagerObserver, // VolumeManagerObserver overrides. virtual void OnDiskAdded(const chromeos::disks::DiskMountManager::Disk& disk, - bool mounting) OVERRIDE; + bool mounting) override; virtual void OnDiskRemoved( - const chromeos::disks::DiskMountManager::Disk& disk) OVERRIDE; - virtual void OnDeviceAdded(const std::string& device_path) OVERRIDE; - virtual void OnDeviceRemoved(const std::string& device_path) OVERRIDE; + const chromeos::disks::DiskMountManager::Disk& disk) override; + virtual void OnDeviceAdded(const std::string& device_path) override; + virtual void OnDeviceRemoved(const std::string& device_path) override; virtual void OnVolumeMounted(chromeos::MountError error_code, - const VolumeInfo& volume_info) OVERRIDE; + const VolumeInfo& volume_info) override; virtual void OnVolumeUnmounted(chromeos::MountError error_code, - const VolumeInfo& volume_info) OVERRIDE; + const VolumeInfo& volume_info) override; virtual void OnFormatStarted(const std::string& device_path, - bool success) OVERRIDE; + bool success) override; virtual void OnFormatCompleted(const std::string& device_path, - bool success) OVERRIDE; + bool success) override; // PowerManagerClient::Observer overrides. - virtual void SuspendImminent() OVERRIDE; - virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE; + virtual void SuspendImminent() override; + virtual void SuspendDone(const base::TimeDelta& sleep_duration) override; bool is_resuming() const { return is_resuming_; } bool is_starting_up() const { return is_starting_up_; } diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc b/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc index 2d2b906..bfeaf9e 100644 --- a/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc +++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc @@ -35,7 +35,7 @@ class DeviceEventRouterImpl : public DeviceEventRouter { // DeviceEventRouter overrides. virtual void OnDeviceEvent(file_manager_private::DeviceEventType type, - const std::string& device_path) OVERRIDE { + const std::string& device_path) override { DeviceEvent event; event.type = type; event.device_path = device_path; @@ -43,7 +43,7 @@ class DeviceEventRouterImpl : public DeviceEventRouter { } // DeviceEventRouter overrides. - virtual bool IsExternalStorageDisabled() OVERRIDE { + virtual bool IsExternalStorageDisabled() override { return external_storage_disabled; } @@ -61,7 +61,7 @@ class DeviceEventRouterImpl : public DeviceEventRouter { class DeviceEventRouterTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { device_event_router.reset(new DeviceEventRouterImpl()); } diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc index 9da656b..9e0604c 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc +++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc @@ -346,7 +346,7 @@ class DeviceEventRouterImpl : public DeviceEventRouter { // DeviceEventRouter overrides. virtual void OnDeviceEvent(file_manager_private::DeviceEventType type, - const std::string& device_path) OVERRIDE { + const std::string& device_path) override { DCHECK_CURRENTLY_ON(BrowserThread::UI); file_manager_private::DeviceEvent event; @@ -359,7 +359,7 @@ class DeviceEventRouterImpl : public DeviceEventRouter { } // DeviceEventRouter overrides. - virtual bool IsExternalStorageDisabled() OVERRIDE { + virtual bool IsExternalStorageDisabled() override { DCHECK_CURRENTLY_ON(BrowserThread::UI); return profile_->GetPrefs()->GetBoolean(prefs::kExternalStorageDisabled); } diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.h b/chrome/browser/chromeos/extensions/file_manager/event_router.h index 2d02909..205591e 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router.h +++ b/chrome/browser/chromeos/extensions/file_manager/event_router.h @@ -61,7 +61,7 @@ class EventRouter : public KeyedService, virtual ~EventRouter(); // KeyedService overrides. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; typedef base::Callback<void(bool success)> BoolCallback; @@ -93,44 +93,44 @@ class EventRouter : public KeyedService, // chromeos::NetworkStateHandlerObserver overrides. virtual void DefaultNetworkChanged( - const chromeos::NetworkState* network) OVERRIDE; + const chromeos::NetworkState* network) override; // drive::JobListObserver overrides. - virtual void OnJobAdded(const drive::JobInfo& job_info) OVERRIDE; - virtual void OnJobUpdated(const drive::JobInfo& job_info) OVERRIDE; + virtual void OnJobAdded(const drive::JobInfo& job_info) override; + virtual void OnJobUpdated(const drive::JobInfo& job_info) override; virtual void OnJobDone(const drive::JobInfo& job_info, - drive::FileError error) OVERRIDE; + drive::FileError error) override; // drive::DriveServiceObserver overrides. - virtual void OnRefreshTokenInvalid() OVERRIDE; + virtual void OnRefreshTokenInvalid() override; // drive::FileSystemObserver overrides. - virtual void OnDirectoryChanged(const base::FilePath& drive_path) OVERRIDE; - virtual void OnFileChanged(const drive::FileChange& changed_files) OVERRIDE; + virtual void OnDirectoryChanged(const base::FilePath& drive_path) override; + virtual void OnFileChanged(const drive::FileChange& changed_files) override; virtual void OnDriveSyncError(drive::file_system::DriveSyncErrorType type, - const base::FilePath& drive_path) OVERRIDE; + const base::FilePath& drive_path) override; // VolumeManagerObserver overrides. virtual void OnDiskAdded( const chromeos::disks::DiskMountManager::Disk& disk, - bool mounting) OVERRIDE; + bool mounting) override; virtual void OnDiskRemoved( - const chromeos::disks::DiskMountManager::Disk& disk) OVERRIDE; - virtual void OnDeviceAdded(const std::string& device_path) OVERRIDE; - virtual void OnDeviceRemoved(const std::string& device_path) OVERRIDE; + const chromeos::disks::DiskMountManager::Disk& disk) override; + virtual void OnDeviceAdded(const std::string& device_path) override; + virtual void OnDeviceRemoved(const std::string& device_path) override; virtual void OnVolumeMounted(chromeos::MountError error_code, - const VolumeInfo& volume_info) OVERRIDE; + const VolumeInfo& volume_info) override; virtual void OnVolumeUnmounted(chromeos::MountError error_code, - const VolumeInfo& volume_info) OVERRIDE; + const VolumeInfo& volume_info) override; virtual void OnFormatStarted( - const std::string& device_path, bool success) OVERRIDE; + const std::string& device_path, bool success) override; virtual void OnFormatCompleted( - const std::string& device_path, bool success) OVERRIDE; + const std::string& device_path, bool success) override; // content::NotificationObserver overrides. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: typedef std::map<base::FilePath, FileWatcher*> WatcherMap; diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router_factory.h b/chrome/browser/chromeos/extensions/file_manager/event_router_factory.h index 0d2feea..7b9b185 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router_factory.h +++ b/chrome/browser/chromeos/extensions/file_manager/event_router_factory.h @@ -26,9 +26,9 @@ class EventRouterFactory : public BrowserContextKeyedServiceFactory { protected: // BrowserContextKeyedBaseFactory overrides: virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; private: friend struct DefaultSingletonTraits<EventRouterFactory>; @@ -38,7 +38,7 @@ class EventRouterFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; }; } // namespace file_manager diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc index b2c3383..0e0c887 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc @@ -100,7 +100,7 @@ class FileSelectorImpl : public FileSelector, public ui::SelectFileDialog::Listener { public: FileSelectorImpl(); - virtual ~FileSelectorImpl() OVERRIDE; + virtual ~FileSelectorImpl() override; protected: // file_manager::FileSelectr overrides. @@ -115,15 +115,15 @@ class FileSelectorImpl : public FileSelector, const base::FilePath& suggested_name, const std::vector<std::string>& allowed_extensions, Browser* browser, - FileBrowserHandlerInternalSelectFileFunction* function) OVERRIDE; + FileBrowserHandlerInternalSelectFileFunction* function) override; // ui::SelectFileDialog::Listener overrides. virtual void FileSelected(const base::FilePath& path, int index, - void* params) OVERRIDE; + void* params) override; virtual void MultiFilesSelected(const std::vector<base::FilePath>& files, - void* params) OVERRIDE; - virtual void FileSelectionCanceled(void* params) OVERRIDE; + void* params) override; + virtual void FileSelectionCanceled(void* params) override; private: // Initiates and shows 'save as' dialog which will be used to prompt user to @@ -256,7 +256,7 @@ class FileSelectorFactoryImpl : public FileSelectorFactory { // FileSelectorFactory implementation. // Creates new FileSelectorImplementation for the function. - virtual FileSelector* CreateFileSelector() const OVERRIDE { + virtual FileSelector* CreateFileSelector() const override { return new FileSelectorImpl(); } diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.h b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.h index e130ae7..fc764c5 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.h +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.h @@ -110,7 +110,7 @@ class FileBrowserHandlerInternalSelectFileFunction // AsyncExtensionFunction implementation. // Runs the extension function implementation. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Respond to the API with selected entry definition. diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc index e8e1b00..70f8b32 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc @@ -87,7 +87,7 @@ class MockFileSelector : public file_manager::FileSelector { const base::FilePath& suggested_name, const std::vector<std::string>& allowed_extensions, Browser* browser, - FileBrowserHandlerInternalSelectFileFunction* function) OVERRIDE { + FileBrowserHandlerInternalSelectFileFunction* function) override { // Confirm that the function suggested us the right name. EXPECT_EQ(suggested_name_, suggested_name); // Confirm that the function allowed us the right extensions. @@ -136,7 +136,7 @@ class MockFileSelectorFactory : public file_manager::FileSelectorFactory { virtual ~MockFileSelectorFactory() {} // file_manager::FileSelectorFactory implementation. - virtual file_manager::FileSelector* CreateFileSelector() const OVERRIDE { + virtual file_manager::FileSelector* CreateFileSelector() const override { return new MockFileSelector(suggested_name_, allowed_extensions_, success_, @@ -159,7 +159,7 @@ class MockFileSelectorFactory : public file_manager::FileSelectorFactory { // Extension api test for the fileBrowserHandler extension API. class FileBrowserHandlerExtensionTest : public ExtensionApiTest { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Create mount point directory that will be used in the test. // Mount point will be called "tmp", and it will be located in a tmp // directory with an unique name. diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc index becf6e5..7644101 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc @@ -123,7 +123,7 @@ class FileManagerPrivateApiTest : public ExtensionApiTest { } // ExtensionApiTest override - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); disk_mount_manager_mock_ = new chromeos::disks::MockDiskMountManager; @@ -131,7 +131,7 @@ class FileManagerPrivateApiTest : public ExtensionApiTest { disk_mount_manager_mock_); disk_mount_manager_mock_->SetupDefaultReplies(); - // OVERRIDE mock functions. + // override mock functions. ON_CALL(*disk_mount_manager_mock_, FindDiskBySourcePath(_)).WillByDefault( Invoke(this, &FileManagerPrivateApiTest::FindVolumeBySourcePath)); EXPECT_CALL(*disk_mount_manager_mock_, disks()) @@ -141,7 +141,7 @@ class FileManagerPrivateApiTest : public ExtensionApiTest { } // ExtensionApiTest override - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { chromeos::disks::DiskMountManager::Shutdown(); disk_mount_manager_mock_ = NULL; diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_base.h b/chrome/browser/chromeos/extensions/file_manager/private_api_base.h index d2e47c3..bea334a 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_base.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_base.h @@ -28,7 +28,7 @@ class LoggedAsyncExtensionFunction : public ChromeAsyncExtensionFunction { virtual ~LoggedAsyncExtensionFunction(); // AsyncExtensionFunction overrides. - virtual void SendResponse(bool success) OVERRIDE; + virtual void SendResponse(bool success) override; // Sets the logging on completion flag. By default, logging is turned off. void set_log_on_completion(bool log_on_completion) { diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.h b/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.h index b06ec2c..0f16cc9 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.h @@ -29,7 +29,7 @@ class FileManagerPrivateCancelDialogFunction virtual ~FileManagerPrivateCancelDialogFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class FileManagerPrivateSelectFileFunction @@ -42,7 +42,7 @@ class FileManagerPrivateSelectFileFunction virtual ~FileManagerPrivateSelectFileFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // A callback method to handle the result of GetSelectedFileInfo. @@ -62,7 +62,7 @@ class FileManagerPrivateSelectFilesFunction virtual ~FileManagerPrivateSelectFilesFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // A callback method to handle the result of GetSelectedFileInfo. diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h index 3b00722..f810e8f 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h @@ -47,7 +47,7 @@ class FileManagerPrivateGetEntryPropertiesFunction virtual ~FileManagerPrivateGetEntryPropertiesFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void CompleteGetEntryProperties( @@ -71,7 +71,7 @@ class FileManagerPrivatePinDriveFileFunction virtual ~FileManagerPrivatePinDriveFileFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Callback for RunAsync(). @@ -89,7 +89,7 @@ class FileManagerPrivateCancelFileTransfersFunction virtual ~FileManagerPrivateCancelFileTransfersFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class FileManagerPrivateSearchDriveFunction @@ -103,7 +103,7 @@ class FileManagerPrivateSearchDriveFunction protected: virtual ~FileManagerPrivateSearchDriveFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Callback for Search(). @@ -131,7 +131,7 @@ class FileManagerPrivateSearchDriveMetadataFunction protected: virtual ~FileManagerPrivateSearchDriveMetadataFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Callback for SearchMetadata(); @@ -157,7 +157,7 @@ class FileManagerPrivateGetDriveConnectionStateFunction protected: virtual ~FileManagerPrivateGetDriveConnectionStateFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // Implements the chrome.fileManagerPrivate.requestAccessToken method. @@ -171,7 +171,7 @@ class FileManagerPrivateRequestAccessTokenFunction virtual ~FileManagerPrivateRequestAccessTokenFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Callback with a cached auth token (if available) or a fetched one. void OnAccessTokenFetched(google_apis::GDataErrorCode code, @@ -189,7 +189,7 @@ class FileManagerPrivateGetShareUrlFunction virtual ~FileManagerPrivateGetShareUrlFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Callback with an url to the sharing dialog as |share_url|, called by // FileSystem::GetShareUrl. @@ -205,7 +205,7 @@ class FileManagerPrivateRequestDriveShareFunction protected: virtual ~FileManagerPrivateRequestDriveShareFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Called back after the drive file system operation is finished. @@ -225,7 +225,7 @@ class FileManagerPrivateGetDownloadUrlFunction virtual ~FileManagerPrivateGetDownloadUrlFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnGetResourceEntry(drive::FileError error, scoped_ptr<drive::ResourceEntry> entry); diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h index 2048f53..ea48c38 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h @@ -42,7 +42,7 @@ class FileManagerPrivateRequestFileSystemFunction virtual ~FileManagerPrivateRequestFileSystemFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void RespondSuccessOnUIThread(const std::string& name, @@ -81,7 +81,7 @@ class FileWatchFunctionBase : public LoggedAsyncExtensionFunction { const std::string& extension_id) = 0; // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Calls SendResponse() with |success| converted to base::Value. void Respond(bool success); @@ -101,7 +101,7 @@ class FileManagerPrivateAddFileWatchFunction : public FileWatchFunctionBase { virtual void PerformFileWatchOperation( const base::FilePath& local_path, const base::FilePath& virtual_path, - const std::string& extension_id) OVERRIDE; + const std::string& extension_id) override; }; @@ -119,7 +119,7 @@ class FileManagerPrivateRemoveFileWatchFunction : public FileWatchFunctionBase { virtual void PerformFileWatchOperation( const base::FilePath& local_path, const base::FilePath& virtual_path, - const std::string& extension_id) OVERRIDE; + const std::string& extension_id) override; }; // Implements the chrome.fileManagerPrivate.getSizeStats method. @@ -133,7 +133,7 @@ class FileManagerPrivateGetSizeStatsFunction virtual ~FileManagerPrivateGetSizeStatsFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void GetDriveAvailableSpaceCallback(drive::FileError error, @@ -157,7 +157,7 @@ class FileManagerPrivateValidatePathNameLengthFunction void OnFilePathLimitRetrieved(size_t current_length, size_t max_length); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; // Implements the chrome.fileManagerPrivate.formatVolume method. @@ -172,7 +172,7 @@ class FileManagerPrivateFormatVolumeFunction virtual ~FileManagerPrivateFormatVolumeFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; // Implements the chrome.fileManagerPrivate.startCopy method. @@ -186,7 +186,7 @@ class FileManagerPrivateStartCopyFunction virtual ~FileManagerPrivateStartCopyFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Part of RunAsync(). Called after Copy() is started on IO thread. @@ -204,7 +204,7 @@ class FileManagerPrivateCancelCopyFunction virtual ~FileManagerPrivateCancelCopyFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; // Implements the chrome.fileManagerPrivateInternal.resolveIsolatedEntries @@ -220,7 +220,7 @@ class FileManagerPrivateInternalResolveIsolatedEntriesFunction virtual ~FileManagerPrivateInternalResolveIsolatedEntriesFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void RunAsyncAfterConvertFileDefinitionListToEntryDefinitionList(scoped_ptr< diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h index c1efb0d..4db5bf3 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h @@ -30,7 +30,7 @@ class FileManagerPrivateLogoutUserForReauthenticationFunction virtual ~FileManagerPrivateLogoutUserForReauthenticationFunction() {} // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // Implements the chrome.fileManagerPrivate.getPreferences method. @@ -44,7 +44,7 @@ class FileManagerPrivateGetPreferencesFunction protected: virtual ~FileManagerPrivateGetPreferencesFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // Implements the chrome.fileManagerPrivate.setPreferences method. @@ -58,7 +58,7 @@ class FileManagerPrivateSetPreferencesFunction protected: virtual ~FileManagerPrivateSetPreferencesFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // Implements the chrome.fileManagerPrivate.zipSelection method. @@ -75,7 +75,7 @@ class FileManagerPrivateZipSelectionFunction virtual ~FileManagerPrivateZipSelectionFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Receives the result from ZipFileCreator. void OnZipDone(bool success); @@ -94,7 +94,7 @@ class FileManagerPrivateZoomFunction : public ChromeSyncExtensionFunction { virtual ~FileManagerPrivateZoomFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // Implements the chrome.fileManagerPrivate.installWebstoreItem method. @@ -108,7 +108,7 @@ class FileManagerPrivateInstallWebstoreItemFunction virtual ~FileManagerPrivateInstallWebstoreItemFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnInstallComplete(bool success, const std::string& error, extensions::webstore_install::Result result); @@ -127,7 +127,7 @@ class FileManagerPrivateRequestWebStoreAccessTokenFunction protected: virtual ~FileManagerPrivateRequestWebStoreAccessTokenFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: scoped_ptr<google_apis::AuthServiceInterface> auth_service_; @@ -147,7 +147,7 @@ class FileManagerPrivateGetProfilesFunction virtual ~FileManagerPrivateGetProfilesFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileManagerPrivateVisitDesktopFunction @@ -160,7 +160,7 @@ class FileManagerPrivateVisitDesktopFunction virtual ~FileManagerPrivateVisitDesktopFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // Implements the chrome.fileManagerPrivate.openInspector method. @@ -173,7 +173,7 @@ class FileManagerPrivateOpenInspectorFunction protected: virtual ~FileManagerPrivateOpenInspectorFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h index c0f680c..bde0ba7 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h @@ -31,7 +31,7 @@ class FileManagerPrivateAddMountFunction : public LoggedAsyncExtensionFunction { virtual ~FileManagerPrivateAddMountFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Part of Run(). Called after GetFile for Drive File System. @@ -59,7 +59,7 @@ class FileManagerPrivateRemoveMountFunction virtual ~FileManagerPrivateRemoveMountFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; // Implements chrome.fileManagerPrivate.getVolumeMetadataList method. @@ -73,7 +73,7 @@ class FileManagerPrivateGetVolumeMetadataListFunction virtual ~FileManagerPrivateGetVolumeMetadataListFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; } // namespace extensions diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.h b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.h index c50589b..8660acd 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.h @@ -25,7 +25,7 @@ class FileManagerPrivateGetStringsFunction virtual ~FileManagerPrivateGetStringsFunction(); // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h index 04c37df..9624d32 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h @@ -35,7 +35,7 @@ class FileManagerPrivateExecuteTaskFunction virtual ~FileManagerPrivateExecuteTaskFunction() {} // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnTaskExecuted( @@ -55,7 +55,7 @@ class FileManagerPrivateGetFileTasksFunction virtual ~FileManagerPrivateGetFileTasksFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnMimeTypesCollected(scoped_ptr<std::vector<std::string> > mime_types); @@ -80,7 +80,7 @@ class FileManagerPrivateSetDefaultTaskFunction virtual ~FileManagerPrivateSetDefaultTaskFunction() {} // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.h b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.h index 3085ecc..c2df097 100644 --- a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.h +++ b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.h @@ -17,7 +17,7 @@ class FileSystemProviderMountFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemProviderMountFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemProviderUnmountFunction : public ChromeSyncExtensionFunction { @@ -27,7 +27,7 @@ class FileSystemProviderUnmountFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemProviderUnmountFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemProviderGetAllFunction : public ChromeSyncExtensionFunction { @@ -37,7 +37,7 @@ class FileSystemProviderGetAllFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemProviderGetAllFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemProviderInternalUnmountRequestedSuccessFunction @@ -49,7 +49,7 @@ class FileSystemProviderInternalUnmountRequestedSuccessFunction protected: virtual ~FileSystemProviderInternalUnmountRequestedSuccessFunction() {} - virtual bool RunWhenValid() OVERRIDE; + virtual bool RunWhenValid() override; }; class FileSystemProviderInternalGetMetadataRequestedSuccessFunction @@ -61,7 +61,7 @@ class FileSystemProviderInternalGetMetadataRequestedSuccessFunction protected: virtual ~FileSystemProviderInternalGetMetadataRequestedSuccessFunction() {} - virtual bool RunWhenValid() OVERRIDE; + virtual bool RunWhenValid() override; }; class FileSystemProviderInternalReadDirectoryRequestedSuccessFunction @@ -73,7 +73,7 @@ class FileSystemProviderInternalReadDirectoryRequestedSuccessFunction protected: virtual ~FileSystemProviderInternalReadDirectoryRequestedSuccessFunction() {} - virtual bool RunWhenValid() OVERRIDE; + virtual bool RunWhenValid() override; }; class FileSystemProviderInternalReadFileRequestedSuccessFunction @@ -85,7 +85,7 @@ class FileSystemProviderInternalReadFileRequestedSuccessFunction protected: virtual ~FileSystemProviderInternalReadFileRequestedSuccessFunction() {} - virtual bool RunWhenValid() OVERRIDE; + virtual bool RunWhenValid() override; }; class FileSystemProviderInternalOperationRequestedSuccessFunction @@ -97,7 +97,7 @@ class FileSystemProviderInternalOperationRequestedSuccessFunction protected: virtual ~FileSystemProviderInternalOperationRequestedSuccessFunction() {} - virtual bool RunWhenValid() OVERRIDE; + virtual bool RunWhenValid() override; }; class FileSystemProviderInternalOperationRequestedErrorFunction @@ -109,7 +109,7 @@ class FileSystemProviderInternalOperationRequestedErrorFunction protected: virtual ~FileSystemProviderInternalOperationRequestedErrorFunction() {} - virtual bool RunWhenValid() OVERRIDE; + virtual bool RunWhenValid() override; }; } // namespace extensions diff --git a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc index 82461ea..5791141 100644 --- a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc +++ b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc @@ -12,7 +12,7 @@ class FileSystemProviderApiTest : public ExtensionApiTest { : current_channel_(chrome::VersionInfo::CHANNEL_DEV) {} // Loads a helper testing extension. - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); const extensions::Extension* extension = LoadExtensionWithFlags( test_data_dir_.AppendASCII("file_system_provider/test_util"), diff --git a/chrome/browser/chromeos/extensions/file_system_provider/provider_function.h b/chrome/browser/chromeos/extensions/file_system_provider/provider_function.h index b575d0e..b6d28c3 100644 --- a/chrome/browser/chromeos/extensions/file_system_provider/provider_function.h +++ b/chrome/browser/chromeos/extensions/file_system_provider/provider_function.h @@ -78,7 +78,7 @@ class FileSystemProviderInternalFunction : public ChromeSyncExtensionFunction { virtual bool RunWhenValid() = 0; // ChromeSyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: // Parses the request in order to extract the request manager. If fails, then diff --git a/chrome/browser/chromeos/extensions/first_run_private_api.h b/chrome/browser/chromeos/extensions/first_run_private_api.h index 684c14b..b682550 100644 --- a/chrome/browser/chromeos/extensions/first_run_private_api.h +++ b/chrome/browser/chromeos/extensions/first_run_private_api.h @@ -19,7 +19,7 @@ class FirstRunPrivateGetLocalizedStringsFunction virtual ~FirstRunPrivateGetLocalizedStringsFunction() {} // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FirstRunPrivateLaunchTutorialFunction @@ -32,7 +32,7 @@ class FirstRunPrivateLaunchTutorialFunction virtual ~FirstRunPrivateLaunchTutorialFunction() {} // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; #endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FIRST_RUN_PRIVATE_API_H_ diff --git a/chrome/browser/chromeos/extensions/info_private_api.h b/chrome/browser/chromeos/extensions/info_private_api.h index afa531c..f4f8ae8 100644 --- a/chrome/browser/chromeos/extensions/info_private_api.h +++ b/chrome/browser/chromeos/extensions/info_private_api.h @@ -23,7 +23,7 @@ class ChromeosInfoPrivateGetFunction : public AsyncExtensionFunction { protected: virtual ~ChromeosInfoPrivateGetFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Returns a newly allocate value, or null. @@ -42,7 +42,7 @@ class ChromeosInfoPrivateSetFunction : public SyncExtensionFunction { protected: virtual ~ChromeosInfoPrivateSetFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DECLARE_EXTENSION_FUNCTION("chromeosInfoPrivate.set", CHROMEOSINFOPRIVATE_SET) diff --git a/chrome/browser/chromeos/extensions/input_method_api.h b/chrome/browser/chromeos/extensions/input_method_api.h index 77f84e8..c7d45e5 100644 --- a/chrome/browser/chromeos/extensions/input_method_api.h +++ b/chrome/browser/chromeos/extensions/input_method_api.h @@ -25,7 +25,7 @@ class GetCurrentInputMethodFunction : public UIThreadExtensionFunction { protected: virtual ~GetCurrentInputMethodFunction() {} - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; private: DECLARE_EXTENSION_FUNCTION("inputMethodPrivate.getCurrentInputMethod", @@ -40,7 +40,7 @@ class SetCurrentInputMethodFunction : public UIThreadExtensionFunction { protected: virtual ~SetCurrentInputMethodFunction() {} - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; private: DECLARE_EXTENSION_FUNCTION("inputMethodPrivate.setCurrentInputMethod", @@ -55,7 +55,7 @@ class GetInputMethodsFunction : public UIThreadExtensionFunction { protected: virtual ~GetInputMethodsFunction() {} - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; private: DECLARE_EXTENSION_FUNCTION("inputMethodPrivate.getInputMethods", @@ -78,11 +78,11 @@ class InputMethodAPI : public BrowserContextKeyedAPI, static BrowserContextKeyedAPIFactory<InputMethodAPI>* GetFactoryInstance(); // BrowserContextKeyedAPI implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // EventRouter::Observer implementation. virtual void OnListenerAdded(const extensions::EventListenerInfo& details) - OVERRIDE; + override; private: friend class BrowserContextKeyedAPIFactory<InputMethodAPI>; diff --git a/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc b/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc index c462fca..a36e6c2 100644 --- a/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc +++ b/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc @@ -41,7 +41,7 @@ class TestListener : public content::NotificationObserver { // Implements the content::NotificationObserver interface. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { const std::string& content = *content::Details<std::string>(details).ptr(); if (content == kBackgroundReady) { // Initializes IMF for testing when receives ready message from @@ -64,7 +64,7 @@ class TestListener : public content::NotificationObserver { }; class ExtensionInputMethodApiTest : public ExtensionApiTest { - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( extensions::switches::kWhitelistedExtensionID, diff --git a/chrome/browser/chromeos/extensions/input_method_event_router.h b/chrome/browser/chromeos/extensions/input_method_event_router.h index 91bfb34..f673a7d 100644 --- a/chrome/browser/chromeos/extensions/input_method_event_router.h +++ b/chrome/browser/chromeos/extensions/input_method_event_router.h @@ -27,7 +27,7 @@ class ExtensionInputMethodEventRouter // Implements input_method::InputMethodManager::Observer: virtual void InputMethodChanged( input_method::InputMethodManager* manager, - bool show_message) OVERRIDE; + bool show_message) override; private: content::BrowserContext* context_; diff --git a/chrome/browser/chromeos/extensions/install_limiter.h b/chrome/browser/chromeos/extensions/install_limiter.h index ae7cd1a..cc5cc54 100644 --- a/chrome/browser/chromeos/extensions/install_limiter.h +++ b/chrome/browser/chromeos/extensions/install_limiter.h @@ -70,7 +70,7 @@ class InstallLimiter : public KeyedService, // content::NotificationObserver overrides: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; content::NotificationRegistrar registrar_; diff --git a/chrome/browser/chromeos/extensions/install_limiter_factory.h b/chrome/browser/chromeos/extensions/install_limiter_factory.h index 6575295..b60b31e 100644 --- a/chrome/browser/chromeos/extensions/install_limiter_factory.h +++ b/chrome/browser/chromeos/extensions/install_limiter_factory.h @@ -31,7 +31,7 @@ class InstallLimiterFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory overrides: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; DISALLOW_COPY_AND_ASSIGN(InstallLimiterFactory); }; diff --git a/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h b/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h index 930edf2..adf6b6b 100644 --- a/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h +++ b/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h @@ -52,7 +52,7 @@ class VirtualKeyboardBrowserTest : public InProcessBrowserTest { // InProcessBrowserTest. // Ensure that the virtual keyboard is enabled. - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; protected: // Accumulates the javascript and injects it when the test starts. The test diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.cc b/chrome/browser/chromeos/extensions/wallpaper_api.cc index c8c637d..e52fde7 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc @@ -54,7 +54,7 @@ class WallpaperFetcher : public net::URLFetcherDelegate { private: // URLFetcherDelegate overrides: - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE { + virtual void OnURLFetchComplete(const net::URLFetcher* source) override { DCHECK(url_fetcher_.get() == source); bool success = source->GetStatus().is_success() && diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.h b/chrome/browser/chromeos/extensions/wallpaper_api.h index 493ff55..8d16b39 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_api.h +++ b/chrome/browser/chromeos/extensions/wallpaper_api.h @@ -29,10 +29,10 @@ class WallpaperSetWallpaperFunction : public WallpaperFunctionBase { virtual ~WallpaperSetWallpaperFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: - virtual void OnWallpaperDecoded(const gfx::ImageSkia& image) OVERRIDE; + virtual void OnWallpaperDecoded(const gfx::ImageSkia& image) override; // Generates thumbnail of custom wallpaper. A simple STRETCH is used for // generating thumbnail. diff --git a/chrome/browser/chromeos/extensions/wallpaper_function_base.cc b/chrome/browser/chromeos/extensions/wallpaper_function_base.cc index 6e89013..1e100c90 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_function_base.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_function_base.cc @@ -68,7 +68,7 @@ class WallpaperFunctionBase::UnsafeWallpaperDecoder } virtual void OnImageDecoded(const ImageDecoder* decoder, - const SkBitmap& decoded_image) OVERRIDE { + const SkBitmap& decoded_image) override { // Make the SkBitmap immutable as we won't modify it. This is important // because otherwise it gets duplicated during painting, wasting memory. SkBitmap immutable(decoded_image); @@ -84,7 +84,7 @@ class WallpaperFunctionBase::UnsafeWallpaperDecoder delete this; } - virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE { + virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override { function_->OnFailure( l10n_util::GetStringUTF8(IDS_WALLPAPER_MANAGER_INVALID_WALLPAPER)); delete this; diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc index 62cf7f60..85270ae 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc @@ -123,7 +123,7 @@ class WindowStateManager : public aura::WindowObserver { void RemoveObserverIfUnreferenced(aura::Window* window); // aura::WindowObserver overrides. - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroyed(aura::Window* window) override; // Map of user id hash and associated list of minimized windows. UserIDHashWindowListMap user_id_hash_window_list_map_; diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.h b/chrome/browser/chromeos/extensions/wallpaper_private_api.h index a9be422..4b3fb0c 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.h +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.h @@ -24,7 +24,7 @@ class WallpaperPrivateGetStringsFunction : public SyncExtensionFunction { virtual ~WallpaperPrivateGetStringsFunction() {} // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class WallpaperPrivateSetWallpaperIfExistsFunction @@ -39,10 +39,10 @@ class WallpaperPrivateSetWallpaperIfExistsFunction virtual ~WallpaperPrivateSetWallpaperIfExistsFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: - virtual void OnWallpaperDecoded(const gfx::ImageSkia& image) OVERRIDE; + virtual void OnWallpaperDecoded(const gfx::ImageSkia& image) override; // File doesn't exist. Sets javascript callback parameter to false. void OnFileNotExists(const std::string& error); @@ -74,10 +74,10 @@ class WallpaperPrivateSetWallpaperFunction : public WallpaperFunctionBase { virtual ~WallpaperPrivateSetWallpaperFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: - virtual void OnWallpaperDecoded(const gfx::ImageSkia& image) OVERRIDE; + virtual void OnWallpaperDecoded(const gfx::ImageSkia& image) override; // Saves the image data to a file. void SaveToFile(); @@ -111,7 +111,7 @@ class WallpaperPrivateResetWallpaperFunction virtual ~WallpaperPrivateResetWallpaperFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class WallpaperPrivateSetCustomWallpaperFunction @@ -126,10 +126,10 @@ class WallpaperPrivateSetCustomWallpaperFunction virtual ~WallpaperPrivateSetCustomWallpaperFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: - virtual void OnWallpaperDecoded(const gfx::ImageSkia& wallpaper) OVERRIDE; + virtual void OnWallpaperDecoded(const gfx::ImageSkia& wallpaper) override; // Generates thumbnail of custom wallpaper. A simple STRETCH is used for // generating thunbail. @@ -165,7 +165,7 @@ class WallpaperPrivateSetCustomWallpaperLayoutFunction virtual ~WallpaperPrivateSetCustomWallpaperLayoutFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class WallpaperPrivateMinimizeInactiveWindowsFunction @@ -180,7 +180,7 @@ class WallpaperPrivateMinimizeInactiveWindowsFunction virtual ~WallpaperPrivateMinimizeInactiveWindowsFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class WallpaperPrivateRestoreMinimizedWindowsFunction @@ -195,7 +195,7 @@ class WallpaperPrivateRestoreMinimizedWindowsFunction virtual ~WallpaperPrivateRestoreMinimizedWindowsFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class WallpaperPrivateGetThumbnailFunction : public AsyncExtensionFunction { @@ -209,7 +209,7 @@ class WallpaperPrivateGetThumbnailFunction : public AsyncExtensionFunction { virtual ~WallpaperPrivateGetThumbnailFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Failed to get thumbnail for |file_name|. @@ -242,7 +242,7 @@ class WallpaperPrivateSaveThumbnailFunction : public AsyncExtensionFunction { virtual ~WallpaperPrivateSaveThumbnailFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Failed to save thumbnail for |file_name|. @@ -270,7 +270,7 @@ class WallpaperPrivateGetOfflineWallpaperListFunction virtual ~WallpaperPrivateGetOfflineWallpaperListFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Enumerates the list of files in online wallpaper directory. diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc index 3388d69..5e7a9ea 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc @@ -51,7 +51,7 @@ class TestMinimizeFunction public: TestMinimizeFunction() {} - virtual bool RunAsync() OVERRIDE { + virtual bool RunAsync() override { return WallpaperPrivateMinimizeInactiveWindowsFunction::RunAsync(); } @@ -64,7 +64,7 @@ class TestRestoreFunction public: TestRestoreFunction() {} - virtual bool RunAsync() OVERRIDE { + virtual bool RunAsync() override { return WallpaperPrivateRestoreMinimizedWindowsFunction::RunAsync(); } protected: @@ -186,8 +186,8 @@ class WallpaperPrivateApiMultiUserUnittest : multi_user_window_manager_(NULL), session_state_delegate_(NULL) {} - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; protected: void SetUpMultiUserWindowManager( diff --git a/chrome/browser/chromeos/external_metrics_unittest.cc b/chrome/browser/chromeos/external_metrics_unittest.cc index eacf0c5..0e38dda 100644 --- a/chrome/browser/chromeos/external_metrics_unittest.cc +++ b/chrome/browser/chromeos/external_metrics_unittest.cc @@ -16,7 +16,7 @@ namespace chromeos { // Need this because of the FRIEND_TEST class ExternalMetricsTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(dir_.CreateUniqueTempDir()); external_metrics_ = ExternalMetrics::CreateForTesting( dir_.path().Append("testfile").value()); diff --git a/chrome/browser/chromeos/external_protocol_dialog.h b/chrome/browser/chromeos/external_protocol_dialog.h index 171ff57..d0d5fc6 100644 --- a/chrome/browser/chromeos/external_protocol_dialog.h +++ b/chrome/browser/chromeos/external_protocol_dialog.h @@ -32,17 +32,17 @@ class ExternalProtocolDialog : public views::DialogDelegate { virtual ~ExternalProtocolDialog(); // views::DialogDelegate Methods: - virtual int GetDialogButtons() const OVERRIDE; + virtual int GetDialogButtons() const override; virtual base::string16 GetDialogButtonLabel( - ui::DialogButton button) const OVERRIDE; - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual void DeleteDelegate() OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual views::View* GetContentsView() OVERRIDE; + ui::DialogButton button) const override; + virtual base::string16 GetWindowTitle() const override; + virtual void DeleteDelegate() override; + virtual bool Accept() override; + virtual views::View* GetContentsView() override; // views::WidgetDelegate Methods: - virtual const views::Widget* GetWidget() const OVERRIDE; - virtual views::Widget* GetWidget() OVERRIDE; + virtual const views::Widget* GetWidget() const override; + virtual views::Widget* GetWidget() override; private: // The message box view whose commands we handle. diff --git a/chrome/browser/chromeos/file_manager/app_installer.cc b/chrome/browser/chromeos/file_manager/app_installer.cc index 0f5c7a1..8427a36 100644 --- a/chrome/browser/chromeos/file_manager/app_installer.cc +++ b/chrome/browser/chromeos/file_manager/app_installer.cc @@ -23,7 +23,7 @@ class AppInstaller::WebContentsObserver : public content::WebContentsObserver { protected: // content::WebContentsObserver implementation. - virtual void WebContentsDestroyed() OVERRIDE { + virtual void WebContentsDestroyed() override { parent_->OnWebContentsDestroyed(web_contents()); } diff --git a/chrome/browser/chromeos/file_manager/app_installer.h b/chrome/browser/chromeos/file_manager/app_installer.h index 75c407e..e08b525 100644 --- a/chrome/browser/chromeos/file_manager/app_installer.h +++ b/chrome/browser/chromeos/file_manager/app_installer.h @@ -34,19 +34,19 @@ class AppInstaller : public extensions::WebstoreStandaloneInstaller { void OnWebContentsDestroyed(content::WebContents* web_contents); // WebstoreStandaloneInstaller implementation. - virtual bool CheckRequestorAlive() const OVERRIDE; - virtual const GURL& GetRequestorURL() const OVERRIDE; - virtual bool ShouldShowPostInstallUI() const OVERRIDE; - virtual bool ShouldShowAppInstalledBubble() const OVERRIDE; - virtual content::WebContents* GetWebContents() const OVERRIDE; + virtual bool CheckRequestorAlive() const override; + virtual const GURL& GetRequestorURL() const override; + virtual bool ShouldShowPostInstallUI() const override; + virtual bool ShouldShowAppInstalledBubble() const override; + virtual content::WebContents* GetWebContents() const override; virtual scoped_refptr<ExtensionInstallPrompt::Prompt> CreateInstallPrompt() - const OVERRIDE; + const override; virtual bool CheckInlineInstallPermitted( const base::DictionaryValue& webstore_data, - std::string* error) const OVERRIDE; + std::string* error) const override; virtual bool CheckRequestorPermitted( const base::DictionaryValue& webstore_data, - std::string* error) const OVERRIDE; + std::string* error) const override; private: class WebContentsObserver; diff --git a/chrome/browser/chromeos/file_manager/drive_test_util.cc b/chrome/browser/chromeos/file_manager/drive_test_util.cc index a7ecf3a..503a912 100644 --- a/chrome/browser/chromeos/file_manager/drive_test_util.cc +++ b/chrome/browser/chromeos/file_manager/drive_test_util.cc @@ -27,7 +27,7 @@ class DriveMountPointWaiter : public drive::DriveIntegrationServiceObserver { } // DriveIntegrationServiceObserver override. - virtual void OnFileSystemMounted() OVERRIDE { + virtual void OnFileSystemMounted() override { // Note that it is OK for |run_loop_.Quit| to be called before // |run_loop_.Run|. In this case |Run| will return immediately. run_loop_.Quit(); diff --git a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc index 79e1823..7de1942 100644 --- a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc +++ b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc @@ -323,12 +323,12 @@ class FileSystemExtensionApiTestBase : public ExtensionApiTest { FileSystemExtensionApiTestBase() {} virtual ~FileSystemExtensionApiTestBase() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { InitTestFileSystem(); ExtensionApiTest::SetUp(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { AddTestMountPoint(); ExtensionApiTest::SetUpOnMainThread(); } @@ -399,15 +399,15 @@ class LocalFileSystemExtensionApiTest : public FileSystemExtensionApiTestBase { LocalFileSystemExtensionApiTest() {} virtual ~LocalFileSystemExtensionApiTest() {} - // FileSystemExtensionApiTestBase OVERRIDE. - virtual void InitTestFileSystem() OVERRIDE { + // FileSystemExtensionApiTestBase override. + virtual void InitTestFileSystem() override { ASSERT_TRUE(InitializeLocalFileSystem( kLocalMountPointName, &tmp_dir_, &mount_point_dir_)) << "Failed to initialize file system."; } - // FileSystemExtensionApiTestBase OVERRIDE. - virtual void AddTestMountPoint() OVERRIDE { + // FileSystemExtensionApiTestBase override. + virtual void AddTestMountPoint() override { EXPECT_TRUE(content::BrowserContext::GetMountPoints(browser()->profile()) ->RegisterFileSystem(kLocalMountPointName, storage::kFileSystemTypeNativeLocal, @@ -429,15 +429,15 @@ class RestrictedFileSystemExtensionApiTest RestrictedFileSystemExtensionApiTest() {} virtual ~RestrictedFileSystemExtensionApiTest() {} - // FileSystemExtensionApiTestBase OVERRIDE. - virtual void InitTestFileSystem() OVERRIDE { + // FileSystemExtensionApiTestBase override. + virtual void InitTestFileSystem() override { ASSERT_TRUE(InitializeLocalFileSystem( kRestrictedMountPointName, &tmp_dir_, &mount_point_dir_)) << "Failed to initialize file system."; } - // FileSystemExtensionApiTestBase OVERRIDE. - virtual void AddTestMountPoint() OVERRIDE { + // FileSystemExtensionApiTestBase override. + virtual void AddTestMountPoint() override { EXPECT_TRUE( content::BrowserContext::GetMountPoints(browser()->profile()) ->RegisterFileSystem(kRestrictedMountPointName, @@ -459,8 +459,8 @@ class DriveFileSystemExtensionApiTest : public FileSystemExtensionApiTestBase { DriveFileSystemExtensionApiTest() : fake_drive_service_(NULL) {} virtual ~DriveFileSystemExtensionApiTest() {} - // FileSystemExtensionApiTestBase OVERRIDE. - virtual void InitTestFileSystem() OVERRIDE { + // FileSystemExtensionApiTestBase override. + virtual void InitTestFileSystem() override { // Set up cache root to be used by DriveIntegrationService. This has to be // done before the browser is created because the service instance is // initialized by EventRouter. @@ -475,8 +475,8 @@ class DriveFileSystemExtensionApiTest : public FileSystemExtensionApiTestBase { &create_drive_integration_service_)); } - // FileSystemExtensionApiTestBase OVERRIDE. - virtual void AddTestMountPoint() OVERRIDE { + // FileSystemExtensionApiTestBase override. + virtual void AddTestMountPoint() override { test_util::WaitUntilDriveMountPointIsAdded(browser()->profile()); } @@ -509,7 +509,7 @@ class MultiProfileDriveFileSystemExtensionApiTest : public: MultiProfileDriveFileSystemExtensionApiTest() : second_profile(NULL) {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { base::FilePath user_data_directory; PathService::Get(chrome::DIR_USER_DATA, &user_data_directory); user_manager::UserManager::Get()->UserLoggedIn( @@ -525,7 +525,7 @@ class MultiProfileDriveFileSystemExtensionApiTest : FileSystemExtensionApiTestBase::SetUpOnMainThread(); } - virtual void InitTestFileSystem() OVERRIDE { + virtual void InitTestFileSystem() override { // This callback will get called during Profile creation. create_drive_integration_service_ = base::Bind( &MultiProfileDriveFileSystemExtensionApiTest:: @@ -536,7 +536,7 @@ class MultiProfileDriveFileSystemExtensionApiTest : &create_drive_integration_service_)); } - virtual void AddTestMountPoint() OVERRIDE { + virtual void AddTestMountPoint() override { test_util::WaitUntilDriveMountPointIsAdded(browser()->profile()); test_util::WaitUntilDriveMountPointIsAdded(second_profile); } @@ -604,8 +604,8 @@ class LocalAndDriveFileSystemExtensionApiTest LocalAndDriveFileSystemExtensionApiTest() {} virtual ~LocalAndDriveFileSystemExtensionApiTest() {} - // FileSystemExtensionApiTestBase OVERRIDE. - virtual void InitTestFileSystem() OVERRIDE { + // FileSystemExtensionApiTestBase override. + virtual void InitTestFileSystem() override { ASSERT_TRUE(InitializeLocalFileSystem( kLocalMountPointName, &local_tmp_dir_, &local_mount_point_dir_)) << "Failed to initialize file system."; @@ -624,8 +624,8 @@ class LocalAndDriveFileSystemExtensionApiTest &create_drive_integration_service_)); } - // FileSystemExtensionApiTestBase OVERRIDE. - virtual void AddTestMountPoint() OVERRIDE { + // FileSystemExtensionApiTestBase override. + virtual void AddTestMountPoint() override { EXPECT_TRUE(content::BrowserContext::GetMountPoints(browser()->profile()) ->RegisterFileSystem(kLocalMountPointName, storage::kFileSystemTypeNativeLocal, diff --git a/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h b/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h index 5e79f28..de493fd 100644 --- a/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h +++ b/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h @@ -49,29 +49,29 @@ class FakeDiskMountManager : public chromeos::disks::DiskMountManager { } // DiskMountManager overrides. - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual const DiskMap& disks() const OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual const DiskMap& disks() const override; virtual const Disk* FindDiskBySourcePath( - const std::string& source_path) const OVERRIDE; - virtual const MountPointMap& mount_points() const OVERRIDE; + const std::string& source_path) const override; + virtual const MountPointMap& mount_points() const override; virtual void EnsureMountInfoRefreshed( - const EnsureMountInfoRefreshedCallback& callback) OVERRIDE; + const EnsureMountInfoRefreshedCallback& callback) override; virtual void MountPath(const std::string& source_path, const std::string& source_format, const std::string& mount_label, - chromeos::MountType type) OVERRIDE; + chromeos::MountType type) override; virtual void UnmountPath(const std::string& mount_path, chromeos::UnmountOptions options, - const UnmountPathCallback& callback) OVERRIDE; - virtual void FormatMountedDevice(const std::string& mount_path) OVERRIDE; + const UnmountPathCallback& callback) override; + virtual void FormatMountedDevice(const std::string& mount_path) override; virtual void UnmountDeviceRecursively( const std::string& device_path, - const UnmountDeviceRecursivelyCallbackType& callback) OVERRIDE; + const UnmountDeviceRecursivelyCallbackType& callback) override; - virtual bool AddDiskForTest(Disk* disk) OVERRIDE; + virtual bool AddDiskForTest(Disk* disk) override; virtual bool AddMountPointForTest( - const MountPointInfo& mount_point) OVERRIDE; + const MountPointInfo& mount_point) override; void InvokeDiskEventForTest(DiskEvent event, const Disk* disk); private: diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index f6ddfbc..c9769b8 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc @@ -277,7 +277,7 @@ class DownloadsTestVolume : public LocalTestVolume { DownloadsTestVolume() : LocalTestVolume("Downloads") {} virtual ~DownloadsTestVolume() {} - virtual bool Mount(Profile* profile) OVERRIDE { + virtual bool Mount(Profile* profile) override { return CreateRootDirectory(profile) && VolumeManager::Get(profile) ->RegisterDownloadsDirectoryForTesting(root_path()); @@ -309,7 +309,7 @@ class FakeTestVolume : public LocalTestVolume { return true; } - virtual bool Mount(Profile* profile) OVERRIDE { + virtual bool Mount(Profile* profile) override { if (!CreateRootDirectory(profile)) return false; storage::ExternalMountPoints* const mount_points = @@ -505,7 +505,7 @@ class FileManagerTestListener : public content::NotificationObserver { virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { Message entry; entry.type = type; entry.message = type != extensions::NOTIFICATION_EXTENSION_TEST_PASSED @@ -527,12 +527,12 @@ class FileManagerTestListener : public content::NotificationObserver { // The base test class. class FileManagerBrowserTestBase : public ExtensionApiTest { protected: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; + virtual void SetUpInProcessBrowserTestFixture() override; - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpOnMainThread() override; // Adds an incognito and guest-mode flags for tests in the guest mode. - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; + virtual void SetUpCommandLine(CommandLine* command_line) override; // Loads our testing extension and sends it a string identifying the current // test. @@ -739,10 +739,10 @@ typedef std::tr1::tuple<GuestMode, const char*> TestParameter; class FileManagerBrowserTest : public FileManagerBrowserTestBase, public ::testing::WithParamInterface<TestParameter> { - virtual GuestMode GetGuestModeParam() const OVERRIDE { + virtual GuestMode GetGuestModeParam() const override { return std::tr1::get<0>(GetParam()); } - virtual const char* GetTestCaseNameParam() const OVERRIDE { + virtual const char* GetTestCaseNameParam() const override { return std::tr1::get<1>(GetParam()); } }; @@ -1087,7 +1087,7 @@ static const TestAccountInfo kTestAccounts[] = { class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase { protected: // Enables multi-profiles. - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { FileManagerBrowserTestBase::SetUpCommandLine(command_line); // Logs in to a dummy profile (For making MultiProfileWindowManager happy; // browser test creates a default window and the manager tries to assign a @@ -1099,7 +1099,7 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase { } // Logs in to the primary profile of this test. - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { const TestAccountInfo& info = kTestAccounts[PRIMARY_ACCOUNT_INDEX]; AddUser(info, true); @@ -1115,7 +1115,7 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase { } // Returns primary profile (if it is already created.) - virtual Profile* profile() OVERRIDE { + virtual Profile* profile() override { Profile* const profile = chromeos::ProfileHelper::GetProfileByUserIdHash( kTestAccounts[PRIMARY_ACCOUNT_INDEX].hash); return profile ? profile : FileManagerBrowserTestBase::profile(); @@ -1137,16 +1137,16 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase { } private: - virtual GuestMode GetGuestModeParam() const OVERRIDE { + virtual GuestMode GetGuestModeParam() const override { return NOT_IN_GUEST_MODE; } - virtual const char* GetTestCaseNameParam() const OVERRIDE { + virtual const char* GetTestCaseNameParam() const override { return test_case_name_.c_str(); } virtual std::string OnMessage(const std::string& name, - const base::Value* value) OVERRIDE { + const base::Value* value) override { if (name == "addAllUsers") { AddAllUsers(); return "true"; @@ -1217,22 +1217,22 @@ IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { template<GuestMode M> class GalleryBrowserTestBase : public FileManagerBrowserTestBase { public: - virtual GuestMode GetGuestModeParam() const OVERRIDE { return M; } - virtual const char* GetTestCaseNameParam() const OVERRIDE { + virtual GuestMode GetGuestModeParam() const override { return M; } + virtual const char* GetTestCaseNameParam() const override { return test_case_name_.c_str(); } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AddScript("common/test_util_common.js"); AddScript("gallery/test_util.js"); FileManagerBrowserTestBase::SetUp(); } virtual std::string OnMessage(const std::string& name, - const base::Value* value) OVERRIDE; + const base::Value* value) override; - virtual const char* GetTestManifestName() const OVERRIDE { + virtual const char* GetTestManifestName() const override { return "gallery_test_manifest.json"; } @@ -1419,28 +1419,28 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDrive) { template<GuestMode M> class VideoPlayerBrowserTestBase : public FileManagerBrowserTestBase { public: - virtual GuestMode GetGuestModeParam() const OVERRIDE { return M; } - virtual const char* GetTestCaseNameParam() const OVERRIDE { + virtual GuestMode GetGuestModeParam() const override { return M; } + virtual const char* GetTestCaseNameParam() const override { return test_case_name_.c_str(); } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AddScript("common/test_util_common.js"); AddScript("video_player/test_util.js"); FileManagerBrowserTestBase::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch( chromeos::switches::kEnableVideoPlayerChromecastSupport); FileManagerBrowserTestBase::SetUpCommandLine(command_line); } virtual std::string OnMessage(const std::string& name, - const base::Value* value) OVERRIDE; + const base::Value* value) override; - virtual const char* GetTestManifestName() const OVERRIDE { + virtual const char* GetTestManifestName() const override { return "video_player_test_manifest.json"; } diff --git a/chrome/browser/chromeos/file_manager/path_util_unittest.cc b/chrome/browser/chromeos/file_manager/path_util_unittest.cc index 0a45f09..c77d917 100644 --- a/chrome/browser/chromeos/file_manager/path_util_unittest.cc +++ b/chrome/browser/chromeos/file_manager/path_util_unittest.cc @@ -22,7 +22,7 @@ class ProfileRelatedTest : public testing::Test { : testing_profile_manager_(TestingBrowserProcess::GetGlobal()) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(testing_profile_manager_.SetUp()); } diff --git a/chrome/browser/chromeos/file_manager/volume_manager.h b/chrome/browser/chromeos/file_manager/volume_manager.h index da1f013..8715df5 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager.h +++ b/chrome/browser/chromeos/file_manager/volume_manager.h @@ -136,7 +136,7 @@ class VolumeManager : public KeyedService, void Initialize(); // Disposes this instance. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Adds an observer. void AddObserver(VolumeManagerObserver* observer); @@ -163,44 +163,44 @@ class VolumeManager : public KeyedService, chromeos::DeviceType device_type); // drive::DriveIntegrationServiceObserver overrides. - virtual void OnFileSystemMounted() OVERRIDE; - virtual void OnFileSystemBeingUnmounted() OVERRIDE; + virtual void OnFileSystemMounted() override; + virtual void OnFileSystemBeingUnmounted() override; // chromeos::disks::DiskMountManager::Observer overrides. virtual void OnDiskEvent( chromeos::disks::DiskMountManager::DiskEvent event, - const chromeos::disks::DiskMountManager::Disk* disk) OVERRIDE; + const chromeos::disks::DiskMountManager::Disk* disk) override; virtual void OnDeviceEvent( chromeos::disks::DiskMountManager::DeviceEvent event, - const std::string& device_path) OVERRIDE; + const std::string& device_path) override; virtual void OnMountEvent( chromeos::disks::DiskMountManager::MountEvent event, chromeos::MountError error_code, const chromeos::disks::DiskMountManager::MountPointInfo& mount_info) - OVERRIDE; + override; virtual void OnFormatEvent( chromeos::disks::DiskMountManager::FormatEvent event, chromeos::FormatError error_code, - const std::string& device_path) OVERRIDE; + const std::string& device_path) override; // chromeos::file_system_provider::Observer overrides. virtual void OnProvidedFileSystemMount( const chromeos::file_system_provider::ProvidedFileSystemInfo& file_system_info, - base::File::Error error) OVERRIDE; + base::File::Error error) override; virtual void OnProvidedFileSystemUnmount( const chromeos::file_system_provider::ProvidedFileSystemInfo& file_system_info, - base::File::Error error) OVERRIDE; + base::File::Error error) override; // Called on change to kExternalStorageDisabled pref. void OnExternalStorageDisabledChanged(); // RemovableStorageObserver overrides. virtual void OnRemovableStorageAttached( - const storage_monitor::StorageInfo& info) OVERRIDE; + const storage_monitor::StorageInfo& info) override; virtual void OnRemovableStorageDetached( - const storage_monitor::StorageInfo& info) OVERRIDE; + const storage_monitor::StorageInfo& info) override; SnapshotManager* snapshot_manager() { return snapshot_manager_.get(); } diff --git a/chrome/browser/chromeos/file_manager/volume_manager_factory.h b/chrome/browser/chromeos/file_manager/volume_manager_factory.h index 21d4207..56cd044 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager_factory.h +++ b/chrome/browser/chromeos/file_manager/volume_manager_factory.h @@ -29,13 +29,13 @@ class VolumeManagerFactory : public BrowserContextKeyedServiceFactory { protected: // BrowserContextKeyedBaseFactory overrides: virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; // BrowserContextKeyedServiceFactory overrides: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; private: // For Singleton. diff --git a/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc b/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc index 3e0748b..5013130 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc +++ b/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc @@ -61,7 +61,7 @@ class LoggingObserver : public VolumeManagerObserver { // VolumeManagerObserver overrides. virtual void OnDiskAdded(const chromeos::disks::DiskMountManager::Disk& disk, - bool mounting) OVERRIDE { + bool mounting) override { Event event; event.type = Event::DISK_ADDED; event.device_path = disk.device_path(); // Keep only device_path. @@ -70,21 +70,21 @@ class LoggingObserver : public VolumeManagerObserver { } virtual void OnDiskRemoved( - const chromeos::disks::DiskMountManager::Disk& disk) OVERRIDE { + const chromeos::disks::DiskMountManager::Disk& disk) override { Event event; event.type = Event::DISK_REMOVED; event.device_path = disk.device_path(); // Keep only device_path. events_.push_back(event); } - virtual void OnDeviceAdded(const std::string& device_path) OVERRIDE { + virtual void OnDeviceAdded(const std::string& device_path) override { Event event; event.type = Event::DEVICE_ADDED; event.device_path = device_path; events_.push_back(event); } - virtual void OnDeviceRemoved(const std::string& device_path) OVERRIDE { + virtual void OnDeviceRemoved(const std::string& device_path) override { Event event; event.type = Event::DEVICE_REMOVED; event.device_path = device_path; @@ -92,7 +92,7 @@ class LoggingObserver : public VolumeManagerObserver { } virtual void OnVolumeMounted(chromeos::MountError error_code, - const VolumeInfo& volume_info) OVERRIDE { + const VolumeInfo& volume_info) override { Event event; event.type = Event::VOLUME_MOUNTED; event.device_path = volume_info.source_path.AsUTF8Unsafe(); @@ -101,7 +101,7 @@ class LoggingObserver : public VolumeManagerObserver { } virtual void OnVolumeUnmounted(chromeos::MountError error_code, - const VolumeInfo& volume_info) OVERRIDE { + const VolumeInfo& volume_info) override { Event event; event.type = Event::VOLUME_UNMOUNTED; event.device_path = volume_info.source_path.AsUTF8Unsafe(); @@ -110,7 +110,7 @@ class LoggingObserver : public VolumeManagerObserver { } virtual void OnFormatStarted( - const std::string& device_path, bool success) OVERRIDE { + const std::string& device_path, bool success) override { Event event; event.type = Event::FORMAT_STARTED; event.device_path = device_path; @@ -119,7 +119,7 @@ class LoggingObserver : public VolumeManagerObserver { } virtual void OnFormatCompleted( - const std::string& device_path, bool success) OVERRIDE { + const std::string& device_path, bool success) override { Event event; event.type = Event::FORMAT_COMPLETED; event.device_path = device_path; @@ -170,7 +170,7 @@ class VolumeManagerTest : public testing::Test { scoped_ptr<VolumeManager> volume_manager_; }; - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { power_manager_client_.reset(new chromeos::FakePowerManagerClient); disk_mount_manager_.reset(new FakeDiskMountManager); main_profile_.reset(new ProfileEnvironment(power_manager_client_.get(), diff --git a/chrome/browser/chromeos/file_manager/zip_file_creator.h b/chrome/browser/chromeos/file_manager/zip_file_creator.h index f94e931..534a9d4 100644 --- a/chrome/browser/chromeos/file_manager/zip_file_creator.h +++ b/chrome/browser/chromeos/file_manager/zip_file_creator.h @@ -47,8 +47,8 @@ class ZipFileCreator : public content::UtilityProcessHostClient { void StartProcessOnIOThread(base::File dest_file); // UtilityProcessHostClient - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnProcessCrashed(int exit_code) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnProcessCrashed(int exit_code) override; // IPC message handlers. void OnCreateZipFileSucceeded(); diff --git a/chrome/browser/chromeos/file_manager/zip_file_creator_browsertest.cc b/chrome/browser/chromeos/file_manager/zip_file_creator_browsertest.cc index 0440369..73929a8 100644 --- a/chrome/browser/chromeos/file_manager/zip_file_creator_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/zip_file_creator_browsertest.cc @@ -28,7 +28,7 @@ void TestCallback(bool* out_success, const base::Closure& quit, bool success) { class ZipFileCreatorTest : public InProcessBrowserTest { protected: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ASSERT_TRUE(dir_.CreateUniqueTempDir()); ASSERT_TRUE(base::CreateDirectory(zip_base_dir())); } diff --git a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h index f9dd955..18894cb 100644 --- a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h +++ b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h @@ -72,59 +72,59 @@ class FakeProvidedFileSystem : public ProvidedFileSystemInterface { // ProvidedFileSystemInterface overrides. virtual AbortCallback RequestUnmount( - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback GetMetadata( const base::FilePath& entry_path, ProvidedFileSystemInterface::MetadataFieldMask fields, const ProvidedFileSystemInterface::GetMetadataCallback& callback) - OVERRIDE; + override; virtual AbortCallback ReadDirectory( const base::FilePath& directory_path, - const storage::AsyncFileUtil::ReadDirectoryCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::ReadDirectoryCallback& callback) override; virtual AbortCallback OpenFile(const base::FilePath& file_path, OpenFileMode mode, - const OpenFileCallback& callback) OVERRIDE; + const OpenFileCallback& callback) override; virtual AbortCallback CloseFile( int file_handle, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback ReadFile( int file_handle, net::IOBuffer* buffer, int64 offset, int length, - const ReadChunkReceivedCallback& callback) OVERRIDE; + const ReadChunkReceivedCallback& callback) override; virtual AbortCallback CreateDirectory( const base::FilePath& directory_path, bool recursive, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback DeleteEntry( const base::FilePath& entry_path, bool recursive, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback CreateFile( const base::FilePath& file_path, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback CopyEntry( const base::FilePath& source_path, const base::FilePath& target_path, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback MoveEntry( const base::FilePath& source_path, const base::FilePath& target_path, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback Truncate( const base::FilePath& file_path, int64 length, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback WriteFile( int file_handle, net::IOBuffer* buffer, int64 offset, int length, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; - virtual const ProvidedFileSystemInfo& GetFileSystemInfo() const OVERRIDE; - virtual RequestManager* GetRequestManager() OVERRIDE; - virtual base::WeakPtr<ProvidedFileSystemInterface> GetWeakPtr() OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; + virtual const ProvidedFileSystemInfo& GetFileSystemInfo() const override; + virtual RequestManager* GetRequestManager() override; + virtual base::WeakPtr<ProvidedFileSystemInterface> GetWeakPtr() override; // Factory callback, to be used in Service::SetFileSystemFactory(). The // |event_router| argument can be NULL. diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h b/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h index 5210403..57796a0 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h +++ b/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h @@ -31,22 +31,22 @@ class BackendDelegate : public chromeos::FileSystemBackendDelegate { // FileSystemBackend::Delegate overrides. virtual storage::AsyncFileUtil* GetAsyncFileUtil( - storage::FileSystemType type) OVERRIDE; + storage::FileSystemType type) override; virtual scoped_ptr<storage::FileStreamReader> CreateFileStreamReader( const storage::FileSystemURL& url, int64 offset, int64 max_bytes_to_read, const base::Time& expected_modification_time, - storage::FileSystemContext* context) OVERRIDE; + storage::FileSystemContext* context) override; virtual scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter( const storage::FileSystemURL& url, int64 offset, - storage::FileSystemContext* context) OVERRIDE; + storage::FileSystemContext* context) override; virtual storage::WatcherManager* GetWatcherManager( - const storage::FileSystemURL& url) OVERRIDE; + const storage::FileSystemURL& url) override; virtual void GetRedirectURLForContents( const storage::FileSystemURL& url, - const storage::URLCallback& callback) OVERRIDE; + const storage::URLCallback& callback) override; private: scoped_ptr<storage::AsyncFileUtil> async_file_util_; diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h index cbb2aa8..fd26944 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h +++ b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h @@ -38,9 +38,9 @@ class BufferingFileStreamReader : public storage::FileStreamReader { // storage::FileStreamReader overrides. virtual int Read(net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int64 GetLength( - const net::Int64CompletionCallback& callback) OVERRIDE; + const net::Int64CompletionCallback& callback) override; private: // Copies data from the preloading buffer and updates the internal iterator. diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc index 546fd35..ea289fe 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc @@ -45,7 +45,7 @@ class FakeFileStreamReader : public storage::FileStreamReader { // storage::FileStreamReader overrides. virtual int Read(net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE { + const net::CompletionCallback& callback) override { DCHECK(log_); log_->push_back(buf_len); @@ -64,7 +64,7 @@ class FakeFileStreamReader : public storage::FileStreamReader { } virtual int64 GetLength( - const net::Int64CompletionCallback& callback) OVERRIDE { + const net::Int64CompletionCallback& callback) override { DCHECK_EQ(net::OK, return_error_); base::MessageLoopProxy::current()->PostTask( FROM_HERE, base::Bind(callback, kFileSize)); diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h index a84c5cf..d2a8704 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h +++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h @@ -39,9 +39,9 @@ class FileStreamReader : public storage::FileStreamReader { // storage::FileStreamReader overrides. virtual int Read(net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int64 GetLength( - const net::Int64CompletionCallback& callback) OVERRIDE; + const net::Int64CompletionCallback& callback) override; private: // Helper class for executing operations on the provided file system. All diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc index 7e216f1..97d28bd 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc @@ -84,7 +84,7 @@ class FileSystemProviderFileStreamReader : public testing::Test { FileSystemProviderFileStreamReader() : profile_(NULL), fake_file_(NULL) {} virtual ~FileSystemProviderFileStreamReader() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); profile_manager_.reset( new TestingProfileManager(TestingBrowserProcess::GetGlobal())); @@ -122,7 +122,7 @@ class FileSystemProviderFileStreamReader : public testing::Test { ASSERT_TRUE(wrong_file_url_.is_valid()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Setting the testing factory to NULL will destroy the created service // associated with the testing profile. ServiceFactory::GetInstance()->SetTestingFactory(profile_, NULL); diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.h b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.h index 120f3d3..991d9ab 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.h +++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.h @@ -29,9 +29,9 @@ class FileStreamWriter : public storage::FileStreamWriter { // storage::FileStreamWriter overrides. virtual int Write(net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE; - virtual int Cancel(const net::CompletionCallback& callback) OVERRIDE; - virtual int Flush(const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; + virtual int Cancel(const net::CompletionCallback& callback) override; + virtual int Flush(const net::CompletionCallback& callback) override; private: // Helper class for executing operations on the provided file system. All diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer_unittest.cc index 8111976..3624e81 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer_unittest.cc @@ -68,7 +68,7 @@ class FileSystemProviderFileStreamWriter : public testing::Test { FileSystemProviderFileStreamWriter() {} virtual ~FileSystemProviderFileStreamWriter() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); profile_manager_.reset( new TestingProfileManager(TestingBrowserProcess::GetGlobal())); @@ -101,7 +101,7 @@ class FileSystemProviderFileStreamWriter : public testing::Test { ASSERT_TRUE(wrong_file_url_.is_valid()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Setting the testing factory to NULL will destroy the created service // associated with the testing profile. ServiceFactory::GetInstance()->SetTestingFactory(profile_, NULL); diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h index eacc529..1eb97be 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h +++ b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h @@ -36,68 +36,68 @@ class ProviderAsyncFileUtil : public storage::AsyncFileUtil { scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, int file_flags, - const CreateOrOpenCallback& callback) OVERRIDE; + const CreateOrOpenCallback& callback) override; virtual void EnsureFileExists( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const EnsureFileExistsCallback& callback) OVERRIDE; + const EnsureFileExistsCallback& callback) override; virtual void CreateDirectory( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, bool exclusive, bool recursive, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void GetFileInfo( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const GetFileInfoCallback& callback) OVERRIDE; + const GetFileInfoCallback& callback) override; virtual void ReadDirectory( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const ReadDirectoryCallback& callback) OVERRIDE; + const ReadDirectoryCallback& callback) override; virtual void Touch(scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, const base::Time& last_access_time, const base::Time& last_modified_time, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void Truncate(scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, int64 length, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void CopyFileLocal( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& src_url, const storage::FileSystemURL& dest_url, CopyOrMoveOption option, const CopyFileProgressCallback& progress_callback, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void MoveFileLocal( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& src_url, const storage::FileSystemURL& dest_url, CopyOrMoveOption option, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void CopyInForeignFile( scoped_ptr<storage::FileSystemOperationContext> context, const base::FilePath& src_file_path, const storage::FileSystemURL& dest_url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void DeleteFile( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void DeleteDirectory( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void DeleteRecursively( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void CreateSnapshotFile( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const CreateSnapshotFileCallback& callback) OVERRIDE; + const CreateSnapshotFileCallback& callback) override; private: DISALLOW_COPY_AND_ASSIGN(ProviderAsyncFileUtil); diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc index dd54591..715d181 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc @@ -119,7 +119,7 @@ class FileSystemProviderProviderAsyncFileUtilTest : public testing::Test { FileSystemProviderProviderAsyncFileUtilTest() {} virtual ~FileSystemProviderProviderAsyncFileUtilTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); profile_manager_.reset( new TestingProfileManager(TestingBrowserProcess::GetGlobal())); @@ -158,7 +158,7 @@ class FileSystemProviderProviderAsyncFileUtilTest : public testing::Test { ASSERT_TRUE(root_url_.is_valid()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Setting the testing factory to NULL will destroy the created service // associated with the testing profile. ServiceFactory::GetInstance()->SetTestingFactory(profile_, NULL); diff --git a/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc b/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc index 1d5540f..61b01bc 100644 --- a/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc @@ -69,7 +69,7 @@ class FileSystemProviderMountPathUtilTest : public testing::Test { FileSystemProviderMountPathUtilTest() {} virtual ~FileSystemProviderMountPathUtilTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { profile_manager_.reset( new TestingProfileManager(TestingBrowserProcess::GetGlobal())); ASSERT_TRUE(profile_manager_->SetUp()); @@ -83,7 +83,7 @@ class FileSystemProviderMountPathUtilTest : public testing::Test { base::Bind(&FakeProvidedFileSystem::Create)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Setting the testing factory to NULL will destroy the created service // associated with the testing profile. ServiceFactory::GetInstance()->SetTestingFactory(profile_, NULL); diff --git a/chrome/browser/chromeos/file_system_provider/notification_manager.cc b/chrome/browser/chromeos/file_system_provider/notification_manager.cc index 9e175c1..487e68a 100644 --- a/chrome/browser/chromeos/file_system_provider/notification_manager.cc +++ b/chrome/browser/chromeos/file_system_provider/notification_manager.cc @@ -32,19 +32,19 @@ class ProviderNotificationDelegate NotificationManager* notification_manager) : notification_manager_(notification_manager) {} - virtual void ButtonClick(int button_index) OVERRIDE { + virtual void ButtonClick(int button_index) override { notification_manager_->OnButtonClick(button_index); } - virtual void Display() OVERRIDE {} + virtual void Display() override {} - virtual void Error() OVERRIDE { notification_manager_->OnError(); } + virtual void Error() override { notification_manager_->OnError(); } - virtual void Close(bool by_user) OVERRIDE { + virtual void Close(bool by_user) override { notification_manager_->OnClose(); } - virtual void Click() OVERRIDE {} + virtual void Click() override {} private: virtual ~ProviderNotificationDelegate() {} diff --git a/chrome/browser/chromeos/file_system_provider/notification_manager.h b/chrome/browser/chromeos/file_system_provider/notification_manager.h index f25242a..03cb31c 100644 --- a/chrome/browser/chromeos/file_system_provider/notification_manager.h +++ b/chrome/browser/chromeos/file_system_provider/notification_manager.h @@ -41,8 +41,8 @@ class NotificationManager : public NotificationManagerInterface, // NotificationManagerInterface overrides: virtual void ShowUnresponsiveNotification( int id, - const NotificationCallback& callback) OVERRIDE; - virtual void HideUnresponsiveNotification(int id) OVERRIDE; + const NotificationCallback& callback) override; + virtual void HideUnresponsiveNotification(int id) override; // Invoked when a button on the notification is clicked. void OnButtonClick(int button_index); @@ -55,7 +55,7 @@ class NotificationManager : public NotificationManagerInterface, // extensions::AppIconLoader::Delegate overrides: virtual void SetAppImage(const std::string& id, - const gfx::ImageSkia& image) OVERRIDE; + const gfx::ImageSkia& image) override; private: typedef std::map<int, NotificationCallback> CallbackMap; diff --git a/chrome/browser/chromeos/file_system_provider/operations/abort.h b/chrome/browser/chromeos/file_system_provider/operations/abort.h index 79f62c8..13a024b 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/abort.h +++ b/chrome/browser/chromeos/file_system_provider/operations/abort.h @@ -35,13 +35,13 @@ class Abort : public Operation { virtual ~Abort(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: int operation_request_id_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/abort_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/abort_unittest.cc index 6518c9b..deabfcd 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/abort_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/abort_unittest.cc @@ -36,7 +36,7 @@ class FileSystemProviderOperationsAbortTest : public testing::Test { FileSystemProviderOperationsAbortTest() {} virtual ~FileSystemProviderOperationsAbortTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/close_file.h b/chrome/browser/chromeos/file_system_provider/operations/close_file.h index 5e41837..7ed7228 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/close_file.h +++ b/chrome/browser/chromeos/file_system_provider/operations/close_file.h @@ -37,13 +37,13 @@ class CloseFile : public Operation { virtual ~CloseFile(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: int open_request_id_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/close_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/close_file_unittest.cc index bb73e06..9b0c55f 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/close_file_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/close_file_unittest.cc @@ -35,7 +35,7 @@ class FileSystemProviderOperationsCloseFileTest : public testing::Test { FileSystemProviderOperationsCloseFileTest() {} virtual ~FileSystemProviderOperationsCloseFileTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/copy_entry.h b/chrome/browser/chromeos/file_system_provider/operations/copy_entry.h index 254c8b9..c58321e 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/copy_entry.h +++ b/chrome/browser/chromeos/file_system_provider/operations/copy_entry.h @@ -36,13 +36,13 @@ class CopyEntry : public Operation { virtual ~CopyEntry(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: base::FilePath source_path_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/copy_entry_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/copy_entry_unittest.cc index e9e5e8c..c285243 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/copy_entry_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/copy_entry_unittest.cc @@ -37,7 +37,7 @@ class FileSystemProviderOperationsCopyEntryTest : public testing::Test { FileSystemProviderOperationsCopyEntryTest() {} virtual ~FileSystemProviderOperationsCopyEntryTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/create_directory.h b/chrome/browser/chromeos/file_system_provider/operations/create_directory.h index d693c0f..94299d7 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/create_directory.h +++ b/chrome/browser/chromeos/file_system_provider/operations/create_directory.h @@ -38,13 +38,13 @@ class CreateDirectory : public Operation { virtual ~CreateDirectory(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: base::FilePath directory_path_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/create_directory_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/create_directory_unittest.cc index 0fc8ce7..aa06706 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/create_directory_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/create_directory_unittest.cc @@ -36,7 +36,7 @@ class FileSystemProviderOperationsCreateDirectoryTest : public testing::Test { FileSystemProviderOperationsCreateDirectoryTest() {} virtual ~FileSystemProviderOperationsCreateDirectoryTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/create_file.h b/chrome/browser/chromeos/file_system_provider/operations/create_file.h index 6830795..630e4ef 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/create_file.h +++ b/chrome/browser/chromeos/file_system_provider/operations/create_file.h @@ -36,13 +36,13 @@ class CreateFile : public Operation { virtual ~CreateFile(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: base::FilePath file_path_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/create_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/create_file_unittest.cc index 36a8ac6..2d00cf8 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/create_file_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/create_file_unittest.cc @@ -36,7 +36,7 @@ class FileSystemProviderOperationsCreateFileTest : public testing::Test { FileSystemProviderOperationsCreateFileTest() {} virtual ~FileSystemProviderOperationsCreateFileTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/delete_entry.h b/chrome/browser/chromeos/file_system_provider/operations/delete_entry.h index 1416c48..4bbe5e1 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/delete_entry.h +++ b/chrome/browser/chromeos/file_system_provider/operations/delete_entry.h @@ -37,13 +37,13 @@ class DeleteEntry : public Operation { virtual ~DeleteEntry(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: base::FilePath entry_path_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/delete_entry_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/delete_entry_unittest.cc index 0f0fb13..cbded1a 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/delete_entry_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/delete_entry_unittest.cc @@ -36,7 +36,7 @@ class FileSystemProviderOperationsDeleteEntryTest : public testing::Test { FileSystemProviderOperationsDeleteEntryTest() {} virtual ~FileSystemProviderOperationsDeleteEntryTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/get_metadata.h b/chrome/browser/chromeos/file_system_provider/operations/get_metadata.h index 5d00fdf..44244cd 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/get_metadata.h +++ b/chrome/browser/chromeos/file_system_provider/operations/get_metadata.h @@ -36,13 +36,13 @@ class GetMetadata : public Operation { virtual ~GetMetadata(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: base::FilePath entry_path_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc index 759afa0..0556066 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc @@ -76,7 +76,7 @@ class FileSystemProviderOperationsGetMetadataTest : public testing::Test { FileSystemProviderOperationsGetMetadataTest() {} virtual ~FileSystemProviderOperationsGetMetadataTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/move_entry.h b/chrome/browser/chromeos/file_system_provider/operations/move_entry.h index 4ccb64b..d48b64c 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/move_entry.h +++ b/chrome/browser/chromeos/file_system_provider/operations/move_entry.h @@ -36,13 +36,13 @@ class MoveEntry : public Operation { virtual ~MoveEntry(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: base::FilePath source_path_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/move_entry_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/move_entry_unittest.cc index 0ea177f..72a5bd4 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/move_entry_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/move_entry_unittest.cc @@ -37,7 +37,7 @@ class FileSystemProviderOperationsMoveEntryTest : public testing::Test { FileSystemProviderOperationsMoveEntryTest() {} virtual ~FileSystemProviderOperationsMoveEntryTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/open_file.h b/chrome/browser/chromeos/file_system_provider/operations/open_file.h index a1031ca..ccbdfe5 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/open_file.h +++ b/chrome/browser/chromeos/file_system_provider/operations/open_file.h @@ -37,13 +37,13 @@ class OpenFile : public Operation { virtual ~OpenFile(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: base::FilePath file_path_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc index de8403d..ae1ed44 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc @@ -71,7 +71,7 @@ class FileSystemProviderOperationsOpenFileTest : public testing::Test { FileSystemProviderOperationsOpenFileTest() {} virtual ~FileSystemProviderOperationsOpenFileTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/operation.h b/chrome/browser/chromeos/file_system_provider/operations/operation.h index 205b9d4..fa5f2dd 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/operation.h +++ b/chrome/browser/chromeos/file_system_provider/operations/operation.h @@ -37,13 +37,13 @@ class Operation : public RequestManager::HandlerInterface { virtual ~Operation(); // RequestManager::HandlerInterface overrides. - virtual bool Execute(int request_id) OVERRIDE = 0; + virtual bool Execute(int request_id) override = 0; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE = 0; + bool has_more) override = 0; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE = 0; + base::File::Error error) override = 0; // Sets custom dispatchign event implementation for tests. void SetDispatchEventImplForTesting( diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_directory.h b/chrome/browser/chromeos/file_system_provider/operations/read_directory.h index c859e59..2b51cbe 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/read_directory.h +++ b/chrome/browser/chromeos/file_system_provider/operations/read_directory.h @@ -35,13 +35,13 @@ class ReadDirectory : public Operation { virtual ~ReadDirectory(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: base::FilePath directory_path_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc index 53b2d6e..f174b0d 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc @@ -79,7 +79,7 @@ class FileSystemProviderOperationsReadDirectoryTest : public testing::Test { FileSystemProviderOperationsReadDirectoryTest() {} virtual ~FileSystemProviderOperationsReadDirectoryTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_file.h b/chrome/browser/chromeos/file_system_provider/operations/read_file.h index a94cfe4..a1a80bc 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/read_file.h +++ b/chrome/browser/chromeos/file_system_provider/operations/read_file.h @@ -42,13 +42,13 @@ class ReadFile : public Operation { virtual ~ReadFile(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: int file_handle_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc index 349737f..38acbc6 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc @@ -76,7 +76,7 @@ class FileSystemProviderOperationsReadFileTest : public testing::Test { FileSystemProviderOperationsReadFileTest() {} virtual ~FileSystemProviderOperationsReadFileTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/truncate.h b/chrome/browser/chromeos/file_system_provider/operations/truncate.h index f5b83e0..154fdcb1 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/truncate.h +++ b/chrome/browser/chromeos/file_system_provider/operations/truncate.h @@ -37,13 +37,13 @@ class Truncate : public Operation { virtual ~Truncate(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: base::FilePath file_path_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/truncate_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/truncate_unittest.cc index 34dfb8f..d7be8f2 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/truncate_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/truncate_unittest.cc @@ -37,7 +37,7 @@ class FileSystemProviderOperationsTruncateTest : public testing::Test { FileSystemProviderOperationsTruncateTest() {} virtual ~FileSystemProviderOperationsTruncateTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/unmount.h b/chrome/browser/chromeos/file_system_provider/operations/unmount.h index 3570fcf..23880ef 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/unmount.h +++ b/chrome/browser/chromeos/file_system_provider/operations/unmount.h @@ -35,13 +35,13 @@ class Unmount : public Operation { virtual ~Unmount(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: const storage::AsyncFileUtil::StatusCallback callback_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/unmount_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/unmount_unittest.cc index 000921b..85c8c01 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/unmount_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/unmount_unittest.cc @@ -33,7 +33,7 @@ class FileSystemProviderOperationsUnmountTest : public testing::Test { FileSystemProviderOperationsUnmountTest() {} virtual ~FileSystemProviderOperationsUnmountTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/operations/write_file.h b/chrome/browser/chromeos/file_system_provider/operations/write_file.h index fa414ab..ad0670c 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/write_file.h +++ b/chrome/browser/chromeos/file_system_provider/operations/write_file.h @@ -42,13 +42,13 @@ class WriteFile : public Operation { virtual ~WriteFile(); // Operation overrides. - virtual bool Execute(int request_id) OVERRIDE; + virtual bool Execute(int request_id) override; virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE; + bool has_more) override; virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE; + base::File::Error error) override; private: int file_handle_; diff --git a/chrome/browser/chromeos/file_system_provider/operations/write_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/write_file_unittest.cc index c397526..88b8372 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/write_file_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/write_file_unittest.cc @@ -39,7 +39,7 @@ class FileSystemProviderOperationsWriteFileTest : public testing::Test { FileSystemProviderOperationsWriteFileTest() {} virtual ~FileSystemProviderOperationsWriteFileTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_system_info_ = ProvidedFileSystemInfo(kExtensionId, kFileSystemId, diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system.h b/chrome/browser/chromeos/file_system_provider/provided_file_system.h index ce896bd..f2e6f46 100644 --- a/chrome/browser/chromeos/file_system_provider/provided_file_system.h +++ b/chrome/browser/chromeos/file_system_provider/provided_file_system.h @@ -40,58 +40,58 @@ class ProvidedFileSystem : public ProvidedFileSystemInterface { // ProvidedFileSystemInterface overrides. virtual AbortCallback RequestUnmount( - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback GetMetadata( const base::FilePath& entry_path, MetadataFieldMask fields, - const GetMetadataCallback& callback) OVERRIDE; + const GetMetadataCallback& callback) override; virtual AbortCallback ReadDirectory( const base::FilePath& directory_path, - const storage::AsyncFileUtil::ReadDirectoryCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::ReadDirectoryCallback& callback) override; virtual AbortCallback OpenFile(const base::FilePath& file_path, OpenFileMode mode, - const OpenFileCallback& callback) OVERRIDE; + const OpenFileCallback& callback) override; virtual AbortCallback CloseFile( int file_handle, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback ReadFile( int file_handle, net::IOBuffer* buffer, int64 offset, int length, - const ReadChunkReceivedCallback& callback) OVERRIDE; + const ReadChunkReceivedCallback& callback) override; virtual AbortCallback CreateDirectory( const base::FilePath& directory_path, bool recursive, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback DeleteEntry( const base::FilePath& entry_path, bool recursive, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback CreateFile( const base::FilePath& file_path, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback CopyEntry( const base::FilePath& source_path, const base::FilePath& target_path, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback MoveEntry( const base::FilePath& source_path, const base::FilePath& target_path, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback Truncate( const base::FilePath& file_path, int64 length, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; virtual AbortCallback WriteFile( int file_handle, net::IOBuffer* buffer, int64 offset, int length, - const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE; - virtual const ProvidedFileSystemInfo& GetFileSystemInfo() const OVERRIDE; - virtual RequestManager* GetRequestManager() OVERRIDE; - virtual base::WeakPtr<ProvidedFileSystemInterface> GetWeakPtr() OVERRIDE; + const storage::AsyncFileUtil::StatusCallback& callback) override; + virtual const ProvidedFileSystemInfo& GetFileSystemInfo() const override; + virtual RequestManager* GetRequestManager() override; + virtual base::WeakPtr<ProvidedFileSystemInterface> GetWeakPtr() override; private: // Aborts an operation executed with a request id equal to diff --git a/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc b/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc index 7209c31..b2363c3 100644 --- a/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc @@ -35,11 +35,11 @@ class FakeNotificationManager : public NotificationManagerInterface { // NotificationManagerInterface overrides: virtual void ShowUnresponsiveNotification( int id, - const NotificationCallback& callback) OVERRIDE { + const NotificationCallback& callback) override { callbacks_[id] = callback; } - virtual void HideUnresponsiveNotification(int id) OVERRIDE { + virtual void HideUnresponsiveNotification(int id) override { callbacks_.erase(id); } @@ -169,7 +169,7 @@ class FakeHandler : public RequestManager::HandlerInterface { : logger_(logger), execute_reply_(execute_reply) {} // RequestManager::Handler overrides. - virtual bool Execute(int request_id) OVERRIDE { + virtual bool Execute(int request_id) override { if (logger_.get()) logger_->OnExecute(request_id); @@ -179,7 +179,7 @@ class FakeHandler : public RequestManager::HandlerInterface { // RequestManager::Handler overrides. virtual void OnSuccess(int request_id, scoped_ptr<RequestValue> result, - bool has_more) OVERRIDE { + bool has_more) override { if (logger_.get()) logger_->OnSuccess(request_id, result.Pass(), has_more); } @@ -187,7 +187,7 @@ class FakeHandler : public RequestManager::HandlerInterface { // RequestManager::Handler overrides. virtual void OnError(int request_id, scoped_ptr<RequestValue> result, - base::File::Error error) OVERRIDE { + base::File::Error error) override { if (logger_.get()) logger_->OnError(request_id, result.Pass(), error); } @@ -253,36 +253,36 @@ class RequestObserver : public RequestManager::Observer { virtual ~RequestObserver() {} // RequestManager::Observer overrides. - virtual void OnRequestCreated(int request_id, RequestType type) OVERRIDE { + virtual void OnRequestCreated(int request_id, RequestType type) override { created_.push_back(CreatedEvent(request_id, type)); } // RequestManager::Observer overrides. - virtual void OnRequestDestroyed(int request_id) OVERRIDE { + virtual void OnRequestDestroyed(int request_id) override { destroyed_.push_back(Event(request_id)); } // RequestManager::Observer overrides. - virtual void OnRequestExecuted(int request_id) OVERRIDE { + virtual void OnRequestExecuted(int request_id) override { executed_.push_back(Event(request_id)); } // RequestManager::Observer overrides. virtual void OnRequestFulfilled(int request_id, const RequestValue& result, - bool has_more) OVERRIDE { + bool has_more) override { fulfilled_.push_back(FulfilledEvent(request_id, has_more)); } // RequestManager::Observer overrides. virtual void OnRequestRejected(int request_id, const RequestValue& result, - base::File::Error error) OVERRIDE { + base::File::Error error) override { rejected_.push_back(RejectedEvent(request_id, error)); } // RequestManager::Observer overrides. - virtual void OnRequestTimeouted(int request_id) OVERRIDE { + virtual void OnRequestTimeouted(int request_id) override { timeouted_.push_back(Event(request_id)); } @@ -311,7 +311,7 @@ class FileSystemProviderRequestManagerTest : public testing::Test { FileSystemProviderRequestManagerTest() {} virtual ~FileSystemProviderRequestManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { notification_manager_.reset(new FakeNotificationManager); request_manager_.reset(new RequestManager(notification_manager_.get())); } diff --git a/chrome/browser/chromeos/file_system_provider/service.h b/chrome/browser/chromeos/file_system_provider/service.h index eec8cee..12686ed 100644 --- a/chrome/browser/chromeos/file_system_provider/service.h +++ b/chrome/browser/chromeos/file_system_provider/service.h @@ -119,10 +119,10 @@ class Service : public KeyedService, virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const extensions::Extension* extension, - extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE; + extensions::UnloadedExtensionInfo::Reason reason) override; virtual void OnExtensionLoaded( content::BrowserContext* browser_context, - const extensions::Extension* extension) OVERRIDE; + const extensions::Extension* extension) override; private: // Key is a pair of an extension id and file system id, which makes it diff --git a/chrome/browser/chromeos/file_system_provider/service_factory.h b/chrome/browser/chromeos/file_system_provider/service_factory.h index bb7cde1..99ce6ab 100644 --- a/chrome/browser/chromeos/file_system_provider/service_factory.h +++ b/chrome/browser/chromeos/file_system_provider/service_factory.h @@ -39,8 +39,8 @@ class ServiceFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory overrides: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; + content::BrowserContext* profile) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; DISALLOW_COPY_AND_ASSIGN(ServiceFactory); }; diff --git a/chrome/browser/chromeos/file_system_provider/service_unittest.cc b/chrome/browser/chromeos/file_system_provider/service_unittest.cc index 38c0dca..e2f949d 100644 --- a/chrome/browser/chromeos/file_system_provider/service_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/service_unittest.cc @@ -68,13 +68,13 @@ class LoggingObserver : public Observer { // file_system_provider::Observer overrides. virtual void OnProvidedFileSystemMount( const ProvidedFileSystemInfo& file_system_info, - base::File::Error error) OVERRIDE { + base::File::Error error) override { mounts.push_back(Event(file_system_info, error)); } virtual void OnProvidedFileSystemUnmount( const ProvidedFileSystemInfo& file_system_info, - base::File::Error error) OVERRIDE { + base::File::Error error) override { unmounts.push_back(Event(file_system_info, error)); } @@ -130,7 +130,7 @@ class FileSystemProviderServiceTest : public testing::Test { virtual ~FileSystemProviderServiceTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { profile_manager_.reset( new TestingProfileManager(TestingBrowserProcess::GetGlobal())); ASSERT_TRUE(profile_manager_->SetUp()); diff --git a/chrome/browser/chromeos/fileapi/external_file_protocol_handler.h b/chrome/browser/chromeos/fileapi/external_file_protocol_handler.h index 88500e0..d05a90b 100644 --- a/chrome/browser/chromeos/fileapi/external_file_protocol_handler.h +++ b/chrome/browser/chromeos/fileapi/external_file_protocol_handler.h @@ -23,7 +23,7 @@ class ExternalFileProtocolHandler // Creates URLRequestJobs for drive:// URLs. virtual net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE; + net::NetworkDelegate* network_delegate) const override; private: // The profile for processing Drive accesses. Should not be NULL. diff --git a/chrome/browser/chromeos/fileapi/external_file_url_request_job.h b/chrome/browser/chromeos/fileapi/external_file_url_request_job.h index 121eed2..ea5ab93 100644 --- a/chrome/browser/chromeos/fileapi/external_file_url_request_job.h +++ b/chrome/browser/chromeos/fileapi/external_file_url_request_job.h @@ -59,15 +59,15 @@ class ExternalFileURLRequestJob : public net::URLRequestJob { // net::URLRequestJob overrides: virtual void SetExtraRequestHeaders( - const net::HttpRequestHeaders& headers) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Kill() OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; + const net::HttpRequestHeaders& headers) override; + virtual void Start() override; + virtual void Kill() override; + virtual bool GetMimeType(std::string* mime_type) const override; virtual bool IsRedirectResponse(GURL* location, - int* http_status_code) OVERRIDE; + int* http_status_code) override; virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, - int* bytes_read) OVERRIDE; + int* bytes_read) override; protected: virtual ~ExternalFileURLRequestJob(); diff --git a/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc b/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc index 8cdfc8c..34cf213 100644 --- a/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc +++ b/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc @@ -58,20 +58,20 @@ class TestURLRequestJobFactory : public net::URLRequestJobFactory { virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler( const std::string& scheme, net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { return new ExternalFileURLRequestJob( profile_id_, request, network_delegate); } - virtual bool IsHandledProtocol(const std::string& scheme) const OVERRIDE { + virtual bool IsHandledProtocol(const std::string& scheme) const override { return scheme == chrome::kExternalFileScheme; } - virtual bool IsHandledURL(const GURL& url) const OVERRIDE { + virtual bool IsHandledURL(const GURL& url) const override { return url.is_valid() && IsHandledProtocol(url.scheme()); } - virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE { + virtual bool IsSafeRedirectTarget(const GURL& location) const override { return true; } @@ -89,7 +89,7 @@ class TestDelegate : public net::TestDelegate { // net::TestDelegate override. virtual void OnReceivedRedirect(net::URLRequest* request, const net::RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE { + bool* defer_redirect) override { redirect_url_ = redirect_info.new_url; net::TestDelegate::OnReceivedRedirect( request, redirect_info, defer_redirect); @@ -114,7 +114,7 @@ class ExternalFileURLRequestJobTest : public testing::Test { virtual ~ExternalFileURLRequestJobTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Create a testing profile. profile_manager_.reset( new TestingProfileManager(TestingBrowserProcess::GetGlobal())); diff --git a/chrome/browser/chromeos/fileapi/external_file_url_util_unittest.cc b/chrome/browser/chromeos/fileapi/external_file_url_util_unittest.cc index 76ee855..afa4372 100644 --- a/chrome/browser/chromeos/fileapi/external_file_url_util_unittest.cc +++ b/chrome/browser/chromeos/fileapi/external_file_url_util_unittest.cc @@ -24,7 +24,7 @@ class ExternalFileURLUtilTest : public testing::Test { ExternalFileURLUtilTest() : testing_profile_manager_(TestingBrowserProcess::GetGlobal()) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(testing_profile_manager_.SetUp()); } diff --git a/chrome/browser/chromeos/fileapi/file_system_backend.h b/chrome/browser/chromeos/fileapi/file_system_backend.h index 9220e89..838c223 100644 --- a/chrome/browser/chromeos/fileapi/file_system_backend.h +++ b/chrome/browser/chromeos/fileapi/file_system_backend.h @@ -88,60 +88,60 @@ class FileSystemBackend : public storage::ExternalFileSystemBackend { static bool CanHandleURL(const storage::FileSystemURL& url); // storage::FileSystemBackend overrides. - virtual bool CanHandleType(storage::FileSystemType type) const OVERRIDE; - virtual void Initialize(storage::FileSystemContext* context) OVERRIDE; + virtual bool CanHandleType(storage::FileSystemType type) const override; + virtual void Initialize(storage::FileSystemContext* context) override; virtual void ResolveURL(const storage::FileSystemURL& url, storage::OpenFileSystemMode mode, - const OpenFileSystemCallback& callback) OVERRIDE; + const OpenFileSystemCallback& callback) override; virtual storage::AsyncFileUtil* GetAsyncFileUtil( - storage::FileSystemType type) OVERRIDE; + storage::FileSystemType type) override; virtual storage::WatcherManager* GetWatcherManager( - storage::FileSystemType type) OVERRIDE; + storage::FileSystemType type) override; virtual storage::CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(storage::FileSystemType type, - base::File::Error* error_code) OVERRIDE; + base::File::Error* error_code) override; virtual storage::FileSystemOperation* CreateFileSystemOperation( const storage::FileSystemURL& url, storage::FileSystemContext* context, - base::File::Error* error_code) const OVERRIDE; + base::File::Error* error_code) const override; virtual bool SupportsStreaming( - const storage::FileSystemURL& url) const OVERRIDE; + const storage::FileSystemURL& url) const override; virtual bool HasInplaceCopyImplementation( - storage::FileSystemType type) const OVERRIDE; + storage::FileSystemType type) const override; virtual scoped_ptr<storage::FileStreamReader> CreateFileStreamReader( const storage::FileSystemURL& path, int64 offset, int64 max_bytes_to_read, const base::Time& expected_modification_time, - storage::FileSystemContext* context) const OVERRIDE; + storage::FileSystemContext* context) const override; virtual scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter( const storage::FileSystemURL& url, int64 offset, - storage::FileSystemContext* context) const OVERRIDE; - virtual storage::FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE; + storage::FileSystemContext* context) const override; + virtual storage::FileSystemQuotaUtil* GetQuotaUtil() override; virtual const storage::UpdateObserverList* GetUpdateObservers( - storage::FileSystemType type) const OVERRIDE; + storage::FileSystemType type) const override; virtual const storage::ChangeObserverList* GetChangeObservers( - storage::FileSystemType type) const OVERRIDE; + storage::FileSystemType type) const override; virtual const storage::AccessObserverList* GetAccessObservers( - storage::FileSystemType type) const OVERRIDE; + storage::FileSystemType type) const override; // storage::ExternalFileSystemBackend overrides. virtual bool IsAccessAllowed( - const storage::FileSystemURL& url) const OVERRIDE; - virtual std::vector<base::FilePath> GetRootDirectories() const OVERRIDE; + const storage::FileSystemURL& url) const override; + virtual std::vector<base::FilePath> GetRootDirectories() const override; virtual void GrantFullAccessToExtension( - const std::string& extension_id) OVERRIDE; + const std::string& extension_id) override; virtual void GrantFileAccessToExtension( const std::string& extension_id, - const base::FilePath& virtual_path) OVERRIDE; + const base::FilePath& virtual_path) override; virtual void RevokeAccessForExtension( - const std::string& extension_id) OVERRIDE; + const std::string& extension_id) override; virtual bool GetVirtualPath(const base::FilePath& filesystem_path, - base::FilePath* virtual_path) OVERRIDE; + base::FilePath* virtual_path) override; virtual void GetRedirectURLForContents( const storage::FileSystemURL& url, - const storage::URLCallback& callback) OVERRIDE; + const storage::URLCallback& callback) override; private: scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_; diff --git a/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h b/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h index 65d08a1..ead4936 100644 --- a/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h +++ b/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h @@ -35,22 +35,22 @@ class MTPFileSystemBackendDelegate : public FileSystemBackendDelegate { // FileSystemBackendDelegate overrides. virtual storage::AsyncFileUtil* GetAsyncFileUtil( - storage::FileSystemType type) OVERRIDE; + storage::FileSystemType type) override; virtual scoped_ptr<storage::FileStreamReader> CreateFileStreamReader( const storage::FileSystemURL& url, int64 offset, int64 max_bytes_to_read, const base::Time& expected_modification_time, - storage::FileSystemContext* context) OVERRIDE; + storage::FileSystemContext* context) override; virtual scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter( const storage::FileSystemURL& url, int64 offset, - storage::FileSystemContext* context) OVERRIDE; + storage::FileSystemContext* context) override; virtual storage::WatcherManager* GetWatcherManager( - const storage::FileSystemURL& url) OVERRIDE; + const storage::FileSystemURL& url) override; virtual void GetRedirectURLForContents( const storage::FileSystemURL& url, - const storage::URLCallback& callback) OVERRIDE; + const storage::URLCallback& callback) override; private: scoped_ptr<DeviceMediaAsyncFileUtil> device_media_async_file_util_; diff --git a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc index cbb3f5f..e3dc30b 100644 --- a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc +++ b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc @@ -52,12 +52,12 @@ class DriveFirstRunTest : public InProcessBrowserTest, DriveFirstRunTest(); // InProcessBrowserTest overrides: - virtual void SetUpOnMainThread() OVERRIDE; - virtual void TearDownOnMainThread() OVERRIDE; + virtual void SetUpOnMainThread() override; + virtual void TearDownOnMainThread() override; // DriveFirstRunController::Observer overrides: - virtual void OnCompletion(bool success) OVERRIDE; - virtual void OnTimedOut() OVERRIDE; + virtual void OnCompletion(bool success) override; + virtual void OnTimedOut() override; void InstallApp(); diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc index 57f5daf..5154e08 100644 --- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc +++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc @@ -85,11 +85,11 @@ class DriveOfflineNotificationDelegate : profile_(profile) {} // message_center::NotificationDelegate overrides: - virtual void Display() OVERRIDE {} - virtual void Error() OVERRIDE {} - virtual void Close(bool by_user) OVERRIDE {} - virtual void Click() OVERRIDE {} - virtual void ButtonClick(int button_index) OVERRIDE; + virtual void Display() override {} + virtual void Error() override {} + virtual void Close(bool by_user) override {} + virtual void Click() override {} + virtual void ButtonClick(int button_index) override; protected: virtual ~DriveOfflineNotificationDelegate() {} @@ -156,12 +156,12 @@ class DriveWebContentsManager : public content::WebContentsObserver, content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code, - const base::string16& error_description) OVERRIDE; + const base::string16& error_description) override; virtual void DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code, - const base::string16& error_description) OVERRIDE; + const base::string16& error_description) override; // content::WebContentsDelegate overrides: virtual bool ShouldCreateWebContents( @@ -171,12 +171,12 @@ class DriveWebContentsManager : public content::WebContentsObserver, const base::string16& frame_name, const GURL& target_url, const std::string& partition_id, - content::SessionStorageNamespace* session_storage_namespace) OVERRIDE; + content::SessionStorageNamespace* session_storage_namespace) override; // content::NotificationObserver overrides: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; Profile* profile_; const std::string app_id_; diff --git a/chrome/browser/chromeos/first_run/first_run.cc b/chrome/browser/chromeos/first_run/first_run.cc index bf2d007..8fafdc7 100644 --- a/chrome/browser/chromeos/first_run/first_run.cc +++ b/chrome/browser/chromeos/first_run/first_run.cc @@ -61,7 +61,7 @@ class DialogLauncher : public content::NotificationObserver { virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { DCHECK(type == chrome::NOTIFICATION_SESSION_STARTED); DCHECK(content::Details<const user_manager::User>(details).ptr() == ProfileHelper::Get()->GetUserByProfile(profile_)); diff --git a/chrome/browser/chromeos/first_run/first_run_browsertest.cc b/chrome/browser/chromeos/first_run/first_run_browsertest.cc index a47c3d9..aa436de 100644 --- a/chrome/browser/chromeos/first_run/first_run_browsertest.cc +++ b/chrome/browser/chromeos/first_run/first_run_browsertest.cc @@ -23,40 +23,40 @@ class FirstRunUIBrowserTest : public InProcessBrowserTest, } // FirstRunActor::Delegate overrides. - virtual void OnActorInitialized() OVERRIDE { + virtual void OnActorInitialized() override { initialized_ = true; if (!on_initialized_callback_.is_null()) on_initialized_callback_.Run(); controller()->OnActorInitialized(); } - virtual void OnNextButtonClicked(const std::string& step_name) OVERRIDE { + virtual void OnNextButtonClicked(const std::string& step_name) override { controller()->OnNextButtonClicked(step_name); } - virtual void OnStepShown(const std::string& step_name) OVERRIDE { + virtual void OnStepShown(const std::string& step_name) override { current_step_name_ = step_name; if (!on_step_shown_callback_.is_null()) on_step_shown_callback_.Run(); controller()->OnStepShown(step_name); } - virtual void OnStepHidden(const std::string& step_name) OVERRIDE { + virtual void OnStepHidden(const std::string& step_name) override { controller()->OnStepHidden(step_name); } - virtual void OnHelpButtonClicked() OVERRIDE { + virtual void OnHelpButtonClicked() override { controller()->OnHelpButtonClicked(); } - virtual void OnActorFinalized() OVERRIDE { + virtual void OnActorFinalized() override { finalized_ = true; if (!on_finalized_callback_.is_null()) on_finalized_callback_.Run(); controller()->OnActorFinalized(); } - virtual void OnActorDestroyed() OVERRIDE { + virtual void OnActorDestroyed() override { controller()->OnActorDestroyed(); } diff --git a/chrome/browser/chromeos/first_run/first_run_controller.h b/chrome/browser/chromeos/first_run/first_run_controller.h index 86ea1a1..d03adc6 100644 --- a/chrome/browser/chromeos/first_run/first_run_controller.h +++ b/chrome/browser/chromeos/first_run/first_run_controller.h @@ -57,16 +57,16 @@ class FirstRunController : public FirstRunActor::Delegate, static FirstRunController* GetInstanceForTest(); // Overriden from FirstRunActor::Delegate. - virtual void OnActorInitialized() OVERRIDE; - virtual void OnNextButtonClicked(const std::string& step_name) OVERRIDE; - virtual void OnHelpButtonClicked() OVERRIDE; - virtual void OnStepShown(const std::string& step_name) OVERRIDE; - virtual void OnStepHidden(const std::string& step_name) OVERRIDE; - virtual void OnActorFinalized() OVERRIDE; - virtual void OnActorDestroyed() OVERRIDE; + virtual void OnActorInitialized() override; + virtual void OnNextButtonClicked(const std::string& step_name) override; + virtual void OnHelpButtonClicked() override; + virtual void OnStepShown(const std::string& step_name) override; + virtual void OnStepHidden(const std::string& step_name) override; + virtual void OnActorFinalized() override; + virtual void OnActorDestroyed() override; // Overriden from ash::FirstRunHelper::Observer. - virtual void OnCancelled() OVERRIDE; + virtual void OnCancelled() override; void RegisterSteps(); void ShowNextStep(); diff --git a/chrome/browser/chromeos/first_run/first_run_view.h b/chrome/browser/chromeos/first_run/first_run_view.h index e72fa0c..c23a7bb 100644 --- a/chrome/browser/chromeos/first_run/first_run_view.h +++ b/chrome/browser/chromeos/first_run/first_run_view.h @@ -33,18 +33,18 @@ class FirstRunView : public views::View, FirstRunActor* GetActor(); // Overriden from views::View. - virtual void Layout() OVERRIDE; - virtual void RequestFocus() OVERRIDE; + virtual void Layout() override; + virtual void RequestFocus() override; content::WebContents* GetWebContents(); private: // Overriden from content::WebContentsDelegate. virtual bool HandleContextMenu( - const content::ContextMenuParams& params) OVERRIDE; + const content::ContextMenuParams& params) override; virtual bool PreHandleGestureEvent( content::WebContents* source, - const blink::WebGestureEvent& event) OVERRIDE; + const blink::WebGestureEvent& event) override; views::WebView* web_view_; diff --git a/chrome/browser/chromeos/first_run/steps/app_list_step.h b/chrome/browser/chromeos/first_run/steps/app_list_step.h index 5e9bcf8..2cef5d2 100644 --- a/chrome/browser/chromeos/first_run/steps/app_list_step.h +++ b/chrome/browser/chromeos/first_run/steps/app_list_step.h @@ -17,7 +17,7 @@ class AppListStep : public Step { private: // Overriden from Step. - virtual void DoShow() OVERRIDE; + virtual void DoShow() override; DISALLOW_COPY_AND_ASSIGN(AppListStep); }; diff --git a/chrome/browser/chromeos/first_run/steps/help_step.h b/chrome/browser/chromeos/first_run/steps/help_step.h index 0524e94..21bb3fe 100644 --- a/chrome/browser/chromeos/first_run/steps/help_step.h +++ b/chrome/browser/chromeos/first_run/steps/help_step.h @@ -17,8 +17,8 @@ class HelpStep : public Step { private: // Overriden from Step. - virtual void DoShow() OVERRIDE; - virtual void DoOnAfterHide() OVERRIDE; + virtual void DoShow() override; + virtual void DoOnAfterHide() override; DISALLOW_COPY_AND_ASSIGN(HelpStep); }; diff --git a/chrome/browser/chromeos/first_run/steps/tray_step.h b/chrome/browser/chromeos/first_run/steps/tray_step.h index 0af9349..1654f25 100644 --- a/chrome/browser/chromeos/first_run/steps/tray_step.h +++ b/chrome/browser/chromeos/first_run/steps/tray_step.h @@ -17,7 +17,7 @@ class TrayStep : public Step { private: // Overriden from Step. - virtual void DoShow() OVERRIDE; + virtual void DoShow() override; DISALLOW_COPY_AND_ASSIGN(TrayStep); }; diff --git a/chrome/browser/chromeos/geolocation/simple_geolocation_request.h b/chrome/browser/chromeos/geolocation/simple_geolocation_request.h index f6baf4d..f9b3c1a 100644 --- a/chrome/browser/chromeos/geolocation/simple_geolocation_request.h +++ b/chrome/browser/chromeos/geolocation/simple_geolocation_request.h @@ -67,7 +67,7 @@ class SimpleGeolocationRequest : private net::URLFetcherDelegate { private: // net::URLFetcherDelegate - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; // Start new request. void StartRequest(); diff --git a/chrome/browser/chromeos/idle_detector.h b/chrome/browser/chromeos/idle_detector.h index 3b9ce77..bf56a3d 100644 --- a/chrome/browser/chromeos/idle_detector.h +++ b/chrome/browser/chromeos/idle_detector.h @@ -24,7 +24,7 @@ class IdleDetector : public wm::UserActivityObserver { private: // wm::UserActivityObserver overrides: - virtual void OnUserActivity(const ui::Event* event) OVERRIDE; + virtual void OnUserActivity(const ui::Event* event) override; // Resets |timer_| to fire when we reach our idle timeout. void ResetTimer(); diff --git a/chrome/browser/chromeos/imageburner/burn_controller.cc b/chrome/browser/chromeos/imageburner/burn_controller.cc index 48b32bf..01a6d94 100644 --- a/chrome/browser/chromeos/imageburner/burn_controller.cc +++ b/chrome/browser/chromeos/imageburner/burn_controller.cc @@ -42,23 +42,23 @@ class BurnControllerImpl // BurnManager::Observer override. virtual void OnDeviceAdded( - const disks::DiskMountManager::Disk& disk) OVERRIDE { + const disks::DiskMountManager::Disk& disk) override { delegate_->OnDeviceAdded(disk); } // BurnManager::Observer override. virtual void OnDeviceRemoved( - const disks::DiskMountManager::Disk& disk) OVERRIDE { + const disks::DiskMountManager::Disk& disk) override { delegate_->OnDeviceRemoved(disk); } // BurnManager::Observer override. - virtual void OnNetworkDetected() OVERRIDE { + virtual void OnNetworkDetected() override { delegate_->OnNetworkDetected(); } // BurnManager::Observer override. - virtual void OnSuccess() OVERRIDE { + virtual void OnSuccess() override { delegate_->OnSuccess(); // TODO(hidehiko): Remove |working_| flag. working_ = false; @@ -69,7 +69,7 @@ class BurnControllerImpl ProgressType progress_type, int64 received_bytes, int64 total_bytes, - const base::TimeDelta& estimated_remaining_time) OVERRIDE { + const base::TimeDelta& estimated_remaining_time) override { delegate_->OnProgressWithRemainingTime( progress_type, received_bytes, total_bytes, estimated_remaining_time); } @@ -77,25 +77,25 @@ class BurnControllerImpl // BurnManager::Observer override. virtual void OnProgress(ProgressType progress_type, int64 received_bytes, - int64 total_bytes) OVERRIDE { + int64 total_bytes) override { delegate_->OnProgress(progress_type, received_bytes, total_bytes); } // StateMachine::Observer interface. - virtual void OnBurnStateChanged(StateMachine::State state) OVERRIDE { + virtual void OnBurnStateChanged(StateMachine::State state) override { if (state != StateMachine::INITIAL && !working_) { // User has started burn process, so let's start observing. StartBurnImage(base::FilePath(), base::FilePath()); } } - virtual void OnError(int error_message_id) OVERRIDE { + virtual void OnError(int error_message_id) override { delegate_->OnFail(error_message_id); working_ = false; } // BurnController override. - virtual void Init() OVERRIDE { + virtual void Init() override { if (state_machine_->state() == StateMachine::BURNING) { // There is nothing else left to do but observe burn progress. burn_manager_->DoBurn(); @@ -107,14 +107,14 @@ class BurnControllerImpl // BurnController override. virtual std::vector<disks::DiskMountManager::Disk> GetBurnableDevices() - OVERRIDE { + override { // Now this is just a proxy to the BurnManager. // TODO(hidehiko): Remove this method. return burn_manager_->GetBurnableDevices(); } // BurnController override. - virtual void CancelBurnImage() OVERRIDE { + virtual void CancelBurnImage() override { burn_manager_->Cancel(); } @@ -122,7 +122,7 @@ class BurnControllerImpl // May be called with empty values if there is a handler that has started // burning, and thus set the target paths. virtual void StartBurnImage(const base::FilePath& target_device_path, - const base::FilePath& target_file_path) OVERRIDE { + const base::FilePath& target_file_path) override { if (!target_device_path.empty() && !target_file_path.empty() && state_machine_->new_burn_posible()) { if (!NetworkHandler::Get()->network_state_handler()->DefaultNetwork()) { diff --git a/chrome/browser/chromeos/imageburner/burn_device_handler.h b/chrome/browser/chromeos/imageburner/burn_device_handler.h index a8a3467..c400515 100644 --- a/chrome/browser/chromeos/imageburner/burn_device_handler.h +++ b/chrome/browser/chromeos/imageburner/burn_device_handler.h @@ -46,18 +46,18 @@ class BurnDeviceHandler : public disks::DiskMountManager::Observer { // DiskMountManager::Observer overrides. virtual void OnDiskEvent( disks::DiskMountManager::DiskEvent event, - const disks::DiskMountManager::Disk* disk) OVERRIDE; + const disks::DiskMountManager::Disk* disk) override; virtual void OnDeviceEvent( disks::DiskMountManager::DeviceEvent event, - const std::string& device_path) OVERRIDE; + const std::string& device_path) override; virtual void OnMountEvent( disks::DiskMountManager::MountEvent event, MountError error_code, - const disks::DiskMountManager::MountPointInfo& mount_info) OVERRIDE; + const disks::DiskMountManager::MountPointInfo& mount_info) override; virtual void OnFormatEvent( disks::DiskMountManager::FormatEvent event, FormatError error_code, - const std::string& device_path) OVERRIDE; + const std::string& device_path) override; private: disks::DiskMountManager* disk_mount_manager_; // Not owned by this class. diff --git a/chrome/browser/chromeos/imageburner/burn_device_handler_unittest.cc b/chrome/browser/chromeos/imageburner/burn_device_handler_unittest.cc index d596739..1cf620d 100644 --- a/chrome/browser/chromeos/imageburner/burn_device_handler_unittest.cc +++ b/chrome/browser/chromeos/imageburner/burn_device_handler_unittest.cc @@ -59,43 +59,43 @@ class FakeDiskMountManager : public disks::DiskMountManager { } // DiskMountManager overrides. - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } - virtual const DiskMap& disks() const OVERRIDE { + virtual const DiskMap& disks() const override { return disks_; } // Following methods are not implemented. virtual const Disk* FindDiskBySourcePath( - const std::string& source_path) const OVERRIDE { + const std::string& source_path) const override { return NULL; } - virtual const MountPointMap& mount_points() const OVERRIDE { + virtual const MountPointMap& mount_points() const override { // Note: mount_points_ will always be empty, now. return mount_points_; } virtual void EnsureMountInfoRefreshed( - const EnsureMountInfoRefreshedCallback& callback) OVERRIDE {} + const EnsureMountInfoRefreshedCallback& callback) override {} virtual void MountPath(const std::string& source_path, const std::string& source_format, const std::string& mount_label, - MountType type) OVERRIDE {} + MountType type) override {} virtual void UnmountPath(const std::string& mount_path, UnmountOptions options, - const UnmountPathCallback& callback) OVERRIDE {} - virtual void FormatMountedDevice(const std::string& mount_path) OVERRIDE {} + const UnmountPathCallback& callback) override {} + virtual void FormatMountedDevice(const std::string& mount_path) override {} virtual void UnmountDeviceRecursively( const std::string& device_path, - const UnmountDeviceRecursivelyCallbackType& callback) OVERRIDE {} - virtual bool AddDiskForTest(Disk* disk) OVERRIDE { return false; } + const UnmountDeviceRecursivelyCallbackType& callback) override {} + virtual bool AddDiskForTest(Disk* disk) override { return false; } virtual bool AddMountPointForTest( - const MountPointInfo& mount_point) OVERRIDE { + const MountPointInfo& mount_point) override { return false; } @@ -138,11 +138,11 @@ void CopyDevicePathCallback( class BurnDeviceHandlerTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { disk_mount_manager_.reset(new FakeDiskMountManager); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { disk_mount_manager_.reset(); } diff --git a/chrome/browser/chromeos/imageburner/burn_manager.h b/chrome/browser/chromeos/imageburner/burn_manager.h index 23cf662..f3b05ed 100644 --- a/chrome/browser/chromeos/imageburner/burn_manager.h +++ b/chrome/browser/chromeos/imageburner/burn_manager.h @@ -311,13 +311,13 @@ class BurnManager : public net::URLFetcherDelegate, void CancelImageFetch(); // URLFetcherDelegate overrides: - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source, int64 current, - int64 total) OVERRIDE; + int64 total) override; // NetworkStateHandlerObserver override. - virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE; + virtual void DefaultNetworkChanged(const NetworkState* network) override; // Creates directory image will be downloaded to. // Must be called from FILE thread. diff --git a/chrome/browser/chromeos/input_method/accessibility.h b/chrome/browser/chromeos/input_method/accessibility.h index 60fb084..8206d33 100644 --- a/chrome/browser/chromeos/input_method/accessibility.h +++ b/chrome/browser/chromeos/input_method/accessibility.h @@ -20,7 +20,7 @@ class Accessibility private: // InputMethodManager::Observer implementation. virtual void InputMethodChanged(InputMethodManager* imm, - bool show_message) OVERRIDE; + bool show_message) override; InputMethodManager* imm_; DISALLOW_COPY_AND_ASSIGN(Accessibility); diff --git a/chrome/browser/chromeos/input_method/browser_state_monitor.h b/chrome/browser/chromeos/input_method/browser_state_monitor.h index 04f0aa8..9907e4c 100644 --- a/chrome/browser/chromeos/input_method/browser_state_monitor.h +++ b/chrome/browser/chromeos/input_method/browser_state_monitor.h @@ -33,7 +33,7 @@ class BrowserStateMonitor : public content::NotificationObserver { // content::NotificationObserver overrides: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: base::Callback<void(InputMethodManager::UISessionState)> observer_; diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h index 8a40b03..285b6c2 100644 --- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h +++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h @@ -47,10 +47,10 @@ class CandidateWindowControllerImpl // CandidateWindowController overrides: virtual void AddObserver( - CandidateWindowController::Observer* observer) OVERRIDE; + CandidateWindowController::Observer* observer) override; virtual void RemoveObserver( - CandidateWindowController::Observer* observer) OVERRIDE; - virtual void Hide() OVERRIDE; + CandidateWindowController::Observer* observer) override; + virtual void Hide() override; protected: static void ConvertLookupTableToInfolistEntry( @@ -60,20 +60,20 @@ class CandidateWindowControllerImpl private: // ash::ime::CandidateWindowView::Observer implementation. - virtual void OnCandidateCommitted(int index) OVERRIDE; + virtual void OnCandidateCommitted(int index) override; // views::WidgetObserver implementation. - virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; + virtual void OnWidgetClosing(views::Widget* widget) override; // IMECandidateWindowHandlerInterface implementation. virtual void SetCursorBounds(const gfx::Rect& cursor_bounds, - const gfx::Rect& composition_head) OVERRIDE; + const gfx::Rect& composition_head) override; virtual void UpdateLookupTable( const ui::CandidateWindow& candidate_window, - bool visible) OVERRIDE; + bool visible) override; virtual void UpdatePreeditText(const base::string16& text, - unsigned int cursor, bool visible) OVERRIDE; - virtual void FocusStateChanged(bool is_focused) OVERRIDE; + unsigned int cursor, bool visible) override; + virtual void FocusStateChanged(bool is_focused) override; void InitCandidateWindowView(); diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h index ab326a4..453c9ef 100644 --- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h +++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h @@ -27,14 +27,14 @@ class ComponentExtensionIMEManagerImpl virtual ~ComponentExtensionIMEManagerImpl(); // ComponentExtensionIMEManagerDelegate overrides: - virtual std::vector<ComponentExtensionIME> ListIME() OVERRIDE; + virtual std::vector<ComponentExtensionIME> ListIME() override; virtual void Load(Profile* profile, const std::string& extension_id, const std::string& manifest, - const base::FilePath& file_path) OVERRIDE; + const base::FilePath& file_path) override; virtual void Unload(Profile* profile, const std::string& extension_id, - const base::FilePath& file_path) OVERRIDE; + const base::FilePath& file_path) override; private: // Reads component extensions and extract their localized information: name, diff --git a/chrome/browser/chromeos/input_method/input_method_delegate_impl.h b/chrome/browser/chromeos/input_method/input_method_delegate_impl.h index 556aad2..c08d7c3 100644 --- a/chrome/browser/chromeos/input_method/input_method_delegate_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_delegate_impl.h @@ -22,12 +22,12 @@ class InputMethodDelegateImpl : public InputMethodDelegate { virtual ~InputMethodDelegateImpl(); // InputMethodDelegate implementation. - virtual std::string GetHardwareKeyboardLayouts() const OVERRIDE; - virtual base::string16 GetLocalizedString(int resource_id) const OVERRIDE; + virtual std::string GetHardwareKeyboardLayouts() const override; + virtual base::string16 GetLocalizedString(int resource_id) const override; virtual base::string16 GetDisplayLanguageName( - const std::string& language_code) const OVERRIDE; + const std::string& language_code) const override; virtual void SetHardwareKeyboardLayoutForTesting( - const std::string& layout) OVERRIDE; + const std::string& layout) override; private: DISALLOW_COPY_AND_ASSIGN(InputMethodDelegateImpl); diff --git a/chrome/browser/chromeos/input_method/input_method_engine.h b/chrome/browser/chromeos/input_method/input_method_engine.h index 671d09e..101c22d 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine.h +++ b/chrome/browser/chromeos/input_method/input_method_engine.h @@ -44,52 +44,52 @@ class InputMethodEngine : public InputMethodEngineInterface { const char* extension_id); // InputMethodEngineInterface overrides. - virtual const std::string& GetActiveComponentId() const OVERRIDE; + virtual const std::string& GetActiveComponentId() const override; virtual bool SetComposition(int context_id, const char* text, int selection_start, int selection_end, int cursor, const std::vector<SegmentInfo>& segments, - std::string* error) OVERRIDE; - virtual bool ClearComposition(int context_id, std::string* error) OVERRIDE; + std::string* error) override; + virtual bool ClearComposition(int context_id, std::string* error) override; virtual bool CommitText(int context_id, const char* text, - std::string* error) OVERRIDE; + std::string* error) override; virtual bool SendKeyEvents(int context_id, - const std::vector<KeyboardEvent>& events) OVERRIDE; + const std::vector<KeyboardEvent>& events) override; virtual const CandidateWindowProperty& - GetCandidateWindowProperty() const OVERRIDE; + GetCandidateWindowProperty() const override; virtual void SetCandidateWindowProperty( - const CandidateWindowProperty& property) OVERRIDE; + const CandidateWindowProperty& property) override; virtual bool SetCandidateWindowVisible(bool visible, - std::string* error) OVERRIDE; + std::string* error) override; virtual bool SetCandidates(int context_id, const std::vector<Candidate>& candidates, - std::string* error) OVERRIDE; + std::string* error) override; virtual bool SetCursorPosition(int context_id, int candidate_id, - std::string* error) OVERRIDE; - virtual bool SetMenuItems(const std::vector<MenuItem>& items) OVERRIDE; - virtual bool UpdateMenuItems(const std::vector<MenuItem>& items) OVERRIDE; - virtual bool IsActive() const OVERRIDE; + std::string* error) override; + virtual bool SetMenuItems(const std::vector<MenuItem>& items) override; + virtual bool UpdateMenuItems(const std::vector<MenuItem>& items) override; + virtual bool IsActive() const override; virtual bool DeleteSurroundingText(int context_id, int offset, size_t number_of_chars, - std::string* error) OVERRIDE; + std::string* error) override; // IMEEngineHandlerInterface overrides. virtual void FocusIn( - const IMEEngineHandlerInterface::InputContext& input_context) OVERRIDE; - virtual void FocusOut() OVERRIDE; - virtual void Enable(const std::string& component_id) OVERRIDE; - virtual void Disable() OVERRIDE; - virtual void PropertyActivate(const std::string& property_name) OVERRIDE; - virtual void Reset() OVERRIDE; + const IMEEngineHandlerInterface::InputContext& input_context) override; + virtual void FocusOut() override; + virtual void Enable(const std::string& component_id) override; + virtual void Disable() override; + virtual void PropertyActivate(const std::string& property_name) override; + virtual void Reset() override; virtual void ProcessKeyEvent(const ui::KeyEvent& key_event, - const KeyEventDoneCallback& callback) OVERRIDE; - virtual void CandidateClicked(uint32 index) OVERRIDE; + const KeyEventDoneCallback& callback) override; + virtual void CandidateClicked(uint32 index) override; virtual void SetSurroundingText(const std::string& text, uint32 cursor_pos, - uint32 anchor_pos) OVERRIDE; - virtual void HideInputView() OVERRIDE; + uint32 anchor_pos) override; + virtual void HideInputView() override; int GetCotextIdForTesting() { return context_id_; } diff --git a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc index d2ce436..cc4b628 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc @@ -50,11 +50,11 @@ class InputMethodEngineBrowserTest : ExtensionBrowserTest() {} virtual ~InputMethodEngineBrowserTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionBrowserTest::SetUpInProcessBrowserTestFixture(); } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { extension_ = NULL; } diff --git a/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc b/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc index 5863571..1edbbf0 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc @@ -65,38 +65,38 @@ class TestObserver : public InputMethodEngineInterface::Observer { TestObserver() : calls_bitmap_(NONE) {} virtual ~TestObserver() {} - virtual void OnActivate(const std::string& engine_id) OVERRIDE { + virtual void OnActivate(const std::string& engine_id) override { calls_bitmap_ |= ACTIVATE; } - virtual void OnDeactivated(const std::string& engine_id) OVERRIDE { + virtual void OnDeactivated(const std::string& engine_id) override { calls_bitmap_ |= DEACTIVATED; } virtual void OnFocus( - const InputMethodEngineInterface::InputContext& context) OVERRIDE { + const InputMethodEngineInterface::InputContext& context) override { calls_bitmap_ |= ONFOCUS; } - virtual void OnBlur(int context_id) OVERRIDE { + virtual void OnBlur(int context_id) override { calls_bitmap_ |= ONBLUR; } virtual void OnKeyEvent( const std::string& engine_id, const InputMethodEngineInterface::KeyboardEvent& event, - input_method::KeyEventHandle* key_data) OVERRIDE {} + input_method::KeyEventHandle* key_data) override {} virtual void OnInputContextUpdate( - const InputMethodEngineInterface::InputContext& context) OVERRIDE {} + const InputMethodEngineInterface::InputContext& context) override {} virtual void OnCandidateClicked( const std::string& engine_id, int candidate_id, - InputMethodEngineInterface::MouseButtonEvent button) OVERRIDE {} + InputMethodEngineInterface::MouseButtonEvent button) override {} virtual void OnMenuItemActivated( const std::string& engine_id, - const std::string& menu_id) OVERRIDE {} + const std::string& menu_id) override {} virtual void OnSurroundingTextChanged( const std::string& engine_id, const std::string& text, int cursor_pos, - int anchor_pos) OVERRIDE {} - virtual void OnReset(const std::string& engine_id) OVERRIDE {} + int anchor_pos) override {} + virtual void OnReset(const std::string& engine_id) override {} unsigned char GetCallsBitmapAndReset() { unsigned char ret = calls_bitmap_; diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h index 8864000..6ccc24f 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h @@ -62,43 +62,43 @@ class InputMethodManagerImpl : public InputMethodManager, bool MethodAwaitsExtensionLoad(const std::string& input_method_id) const; // InputMethodManager::State overrides. - virtual scoped_refptr<InputMethodManager::State> Clone() const OVERRIDE; + virtual scoped_refptr<InputMethodManager::State> Clone() const override; virtual void AddInputMethodExtension( const std::string& extension_id, const InputMethodDescriptors& descriptors, - InputMethodEngineInterface* instance) OVERRIDE; + InputMethodEngineInterface* instance) override; virtual void RemoveInputMethodExtension( - const std::string& extension_id) OVERRIDE; + const std::string& extension_id) override; virtual void ChangeInputMethod(const std::string& input_method_id, - bool show_message) OVERRIDE; + bool show_message) override; virtual bool EnableInputMethod( - const std::string& new_active_input_method_id) OVERRIDE; + const std::string& new_active_input_method_id) override; virtual void EnableLoginLayouts( const std::string& language_code, - const std::vector<std::string>& initial_layouts) OVERRIDE; - virtual void EnableLockScreenLayouts() OVERRIDE; + const std::vector<std::string>& initial_layouts) override; + virtual void EnableLockScreenLayouts() override; virtual void GetInputMethodExtensions( - InputMethodDescriptors* result) OVERRIDE; + InputMethodDescriptors* result) override; virtual scoped_ptr<InputMethodDescriptors> GetActiveInputMethods() - const OVERRIDE; + const override; virtual const std::vector<std::string>& GetActiveInputMethodIds() - const OVERRIDE; + const override; virtual const InputMethodDescriptor* GetInputMethodFromId( - const std::string& input_method_id) const OVERRIDE; - virtual size_t GetNumActiveInputMethods() const OVERRIDE; + const std::string& input_method_id) const override; + virtual size_t GetNumActiveInputMethods() const override; virtual void SetEnabledExtensionImes( - std::vector<std::string>* ids) OVERRIDE; - virtual void SetInputMethodLoginDefault() OVERRIDE; + std::vector<std::string>* ids) override; + virtual void SetInputMethodLoginDefault() override; virtual void SetInputMethodLoginDefaultFromVPD( const std::string& locale, - const std::string& layout) OVERRIDE; - virtual bool SwitchToNextInputMethod() OVERRIDE; + const std::string& layout) override; + virtual bool SwitchToNextInputMethod() override; virtual bool SwitchToPreviousInputMethod( - const ui::Accelerator& accelerator) OVERRIDE; - virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE; - virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE; + const ui::Accelerator& accelerator) override; + virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) override; + virtual InputMethodDescriptor GetCurrentInputMethod() const override; virtual bool ReplaceEnabledInputMethods( - const std::vector<std::string>& new_active_input_method_ids) OVERRIDE; + const std::vector<std::string>& new_active_input_method_ids) override; // ------------------------- Data members. Profile* const profile; @@ -139,34 +139,34 @@ class InputMethodManagerImpl : public InputMethodManager, void SetUISessionState(UISessionState new_ui_session); // InputMethodManager override: - virtual UISessionState GetUISessionState() OVERRIDE; - virtual void AddObserver(InputMethodManager::Observer* observer) OVERRIDE; + virtual UISessionState GetUISessionState() override; + virtual void AddObserver(InputMethodManager::Observer* observer) override; virtual void AddCandidateWindowObserver( - InputMethodManager::CandidateWindowObserver* observer) OVERRIDE; - virtual void RemoveObserver(InputMethodManager::Observer* observer) OVERRIDE; + InputMethodManager::CandidateWindowObserver* observer) override; + virtual void RemoveObserver(InputMethodManager::Observer* observer) override; virtual void RemoveCandidateWindowObserver( - InputMethodManager::CandidateWindowObserver* observer) OVERRIDE; + InputMethodManager::CandidateWindowObserver* observer) override; virtual scoped_ptr<InputMethodDescriptors> - GetSupportedInputMethods() const OVERRIDE; - virtual void ActivateInputMethodMenuItem(const std::string& key) OVERRIDE; - virtual bool IsISOLevel5ShiftUsedByCurrentInputMethod() const OVERRIDE; - virtual bool IsAltGrUsedByCurrentInputMethod() const OVERRIDE; + GetSupportedInputMethods() const override; + virtual void ActivateInputMethodMenuItem(const std::string& key) override; + virtual bool IsISOLevel5ShiftUsedByCurrentInputMethod() const override; + virtual bool IsAltGrUsedByCurrentInputMethod() const override; - virtual ImeKeyboard* GetImeKeyboard() OVERRIDE; - virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE; + virtual ImeKeyboard* GetImeKeyboard() override; + virtual InputMethodUtil* GetInputMethodUtil() override; virtual ComponentExtensionIMEManager* - GetComponentExtensionIMEManager() OVERRIDE; - virtual bool IsLoginKeyboard(const std::string& layout) const OVERRIDE; + GetComponentExtensionIMEManager() override; + virtual bool IsLoginKeyboard(const std::string& layout) const override; virtual bool MigrateInputMethods( - std::vector<std::string>* input_method_ids) OVERRIDE; + std::vector<std::string>* input_method_ids) override; virtual scoped_refptr<InputMethodManager::State> CreateNewState( - Profile* profile) OVERRIDE; + Profile* profile) override; - virtual scoped_refptr<InputMethodManager::State> GetActiveIMEState() OVERRIDE; + virtual scoped_refptr<InputMethodManager::State> GetActiveIMEState() override; virtual void SetState( - scoped_refptr<InputMethodManager::State> state) OVERRIDE; + scoped_refptr<InputMethodManager::State> state) override; // Sets |candidate_window_controller_|. void SetCandidateWindowControllerForTesting( @@ -181,9 +181,9 @@ class InputMethodManagerImpl : public InputMethodManager, friend class InputMethodManagerImplTest; // CandidateWindowController::Observer overrides: - virtual void CandidateClicked(int index) OVERRIDE; - virtual void CandidateWindowOpened() OVERRIDE; - virtual void CandidateWindowClosed() OVERRIDE; + virtual void CandidateClicked(int index) override; + virtual void CandidateWindowOpened() override; + virtual void CandidateWindowClosed() override; // Temporarily deactivates all input methods (e.g. Chinese, Japanese, Arabic) // since they are not necessary to input a login password. Users are still diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc index d58c838..498a0c1 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc @@ -71,12 +71,12 @@ class TestObserver : public InputMethodManager::Observer, virtual ~TestObserver() {} virtual void InputMethodChanged(InputMethodManager* manager, - bool show_message) OVERRIDE { + bool show_message) override { ++input_method_changed_count_; last_show_message_ = show_message; } virtual void InputMethodMenuItemChanged( - ash::ime::InputMethodMenuManager* manager) OVERRIDE { + ash::ime::InputMethodMenuManager* manager) override { ++input_method_menu_item_changed_count_; } @@ -98,10 +98,10 @@ class TestCandidateWindowObserver virtual ~TestCandidateWindowObserver() {} - virtual void CandidateWindowOpened(InputMethodManager* manager) OVERRIDE { + virtual void CandidateWindowOpened(InputMethodManager* manager) override { ++candidate_window_opened_count_; } - virtual void CandidateWindowClosed(InputMethodManager* manager) OVERRIDE { + virtual void CandidateWindowClosed(InputMethodManager* manager) override { ++candidate_window_closed_count_; } @@ -122,7 +122,7 @@ class InputMethodManagerImplTest : public BrowserWithTestWindowTest { } virtual ~InputMethodManagerImplTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { profile_manager_.reset(new TestingProfileManager(GetBrowserProcess())); ASSERT_TRUE(profile_manager_->SetUp()); @@ -148,7 +148,7 @@ class InputMethodManagerImplTest : public BrowserWithTestWindowTest { BrowserWithTestWindowTest::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { BrowserWithTestWindowTest::TearDown(); ui::ShutdownInputMethodForTesting(); diff --git a/chrome/browser/chromeos/input_method/input_method_persistence.h b/chrome/browser/chromeos/input_method/input_method_persistence.h index a9fe28c..c477c03 100644 --- a/chrome/browser/chromeos/input_method/input_method_persistence.h +++ b/chrome/browser/chromeos/input_method/input_method_persistence.h @@ -33,7 +33,7 @@ class InputMethodPersistence : public InputMethodManager::Observer { // InputMethodManager::Observer overrides. virtual void InputMethodChanged(InputMethodManager* manager, - bool show_message) OVERRIDE; + bool show_message) override; private: InputMethodManager* input_method_manager_; diff --git a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc index da06153..1bb456d 100644 --- a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc @@ -38,7 +38,7 @@ class InputMethodPersistenceTest : public testing::Test { fake_user_manager_(new chromeos::FakeUserManager()), user_manager_enabler_(fake_user_manager_) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(mock_profile_manager_.SetUp()); // Add a user. diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc index 0f117a8..0e06cbb 100644 --- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc @@ -53,7 +53,7 @@ class InputMethodUtilTest : public testing::Test { base::Bind(&InputMethodUtilTest::GetDisplayLanguageName)); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { InputMethodDescriptors input_methods; std::vector<std::string> layouts; diff --git a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h b/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h index 0cb1fdf..71d6620 100644 --- a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h +++ b/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h @@ -19,9 +19,9 @@ class MockCandidateWindowController : public CandidateWindowController { virtual ~MockCandidateWindowController(); // CandidateWindowController overrides: - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual void Hide() OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual void Hide() override; // Notifies observers. void NotifyCandidateWindowOpened(); diff --git a/chrome/browser/chromeos/input_method/mock_input_method_engine.h b/chrome/browser/chromeos/input_method/mock_input_method_engine.h index b6ddaaf..4926f7e 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_engine.h +++ b/chrome/browser/chromeos/input_method/mock_input_method_engine.h @@ -36,52 +36,52 @@ class MockInputMethodEngine : public InputMethodEngineInterface { virtual ~MockInputMethodEngine(); // InputMethodEngineInterface overrides. - virtual const std::string& GetActiveComponentId() const OVERRIDE; + virtual const std::string& GetActiveComponentId() const override; virtual bool SetComposition(int context_id, const char* text, int selection_start, int selection_end, int cursor, const std::vector<SegmentInfo>& segments, - std::string* error) OVERRIDE; - virtual bool ClearComposition(int context_id, std::string* error) OVERRIDE; + std::string* error) override; + virtual bool ClearComposition(int context_id, std::string* error) override; virtual bool CommitText(int context_id, const char* text, - std::string* error) OVERRIDE; + std::string* error) override; virtual bool SendKeyEvents(int context_id, - const std::vector<KeyboardEvent>& events) OVERRIDE; + const std::vector<KeyboardEvent>& events) override; virtual const CandidateWindowProperty& - GetCandidateWindowProperty() const OVERRIDE; + GetCandidateWindowProperty() const override; virtual void SetCandidateWindowProperty( - const CandidateWindowProperty& property) OVERRIDE; + const CandidateWindowProperty& property) override; virtual bool SetCandidateWindowVisible(bool visible, - std::string* error) OVERRIDE; + std::string* error) override; virtual bool SetCandidates(int context_id, const std::vector<Candidate>& candidates, - std::string* error) OVERRIDE; + std::string* error) override; virtual bool SetCursorPosition(int context_id, int candidate_id, - std::string* error) OVERRIDE; - virtual bool SetMenuItems(const std::vector<MenuItem>& items) OVERRIDE; - virtual bool UpdateMenuItems(const std::vector<MenuItem>& items) OVERRIDE; - virtual bool IsActive() const OVERRIDE; + std::string* error) override; + virtual bool SetMenuItems(const std::vector<MenuItem>& items) override; + virtual bool UpdateMenuItems(const std::vector<MenuItem>& items) override; + virtual bool IsActive() const override; virtual bool DeleteSurroundingText(int context_id, int offset, size_t number_of_chars, - std::string* error) OVERRIDE; + std::string* error) override; // IMEEngineHandlerInterface overrides. virtual void FocusIn( - const IMEEngineHandlerInterface::InputContext& input_context) OVERRIDE; - virtual void FocusOut() OVERRIDE; - virtual void Enable(const std::string& component_id) OVERRIDE; - virtual void Disable() OVERRIDE; - virtual void PropertyActivate(const std::string& property_name) OVERRIDE; - virtual void Reset() OVERRIDE; + const IMEEngineHandlerInterface::InputContext& input_context) override; + virtual void FocusOut() override; + virtual void Enable(const std::string& component_id) override; + virtual void Disable() override; + virtual void PropertyActivate(const std::string& property_name) override; + virtual void Reset() override; virtual void ProcessKeyEvent(const ui::KeyEvent& key_event, - const KeyEventDoneCallback& callback) OVERRIDE; - virtual void CandidateClicked(uint32 index) OVERRIDE; + const KeyEventDoneCallback& callback) override; + virtual void CandidateClicked(uint32 index) override; virtual void SetSurroundingText(const std::string& text, uint32 cursor_pos, - uint32 anchor_pos) OVERRIDE; - virtual void HideInputView() OVERRIDE; + uint32 anchor_pos) override; + virtual void HideInputView() override; std::string last_activated_property() const { return last_activated_property_; diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.h b/chrome/browser/chromeos/input_method/mock_input_method_manager.h index 2830a3e..76b7c22 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h +++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h @@ -22,43 +22,43 @@ class MockInputMethodManager : public InputMethodManager { public: explicit State(MockInputMethodManager* manager); - virtual scoped_refptr<InputMethodManager::State> Clone() const OVERRIDE; + virtual scoped_refptr<InputMethodManager::State> Clone() const override; virtual void AddInputMethodExtension( const std::string& extension_id, const InputMethodDescriptors& descriptors, - InputMethodEngineInterface* instance) OVERRIDE; + InputMethodEngineInterface* instance) override; virtual void RemoveInputMethodExtension( - const std::string& extension_id) OVERRIDE; + const std::string& extension_id) override; virtual void ChangeInputMethod(const std::string& input_method_id, - bool show_message) OVERRIDE; + bool show_message) override; virtual bool EnableInputMethod( - const std::string& new_active_input_method_id) OVERRIDE; + const std::string& new_active_input_method_id) override; virtual void EnableLoginLayouts( const std::string& language_code, - const std::vector<std::string>& initial_layouts) OVERRIDE; - virtual void EnableLockScreenLayouts() OVERRIDE; + const std::vector<std::string>& initial_layouts) override; + virtual void EnableLockScreenLayouts() override; virtual void GetInputMethodExtensions( - InputMethodDescriptors* result) OVERRIDE; + InputMethodDescriptors* result) override; virtual scoped_ptr<InputMethodDescriptors> GetActiveInputMethods() - const OVERRIDE; + const override; virtual const std::vector<std::string>& GetActiveInputMethodIds() - const OVERRIDE; + const override; virtual const InputMethodDescriptor* GetInputMethodFromId( - const std::string& input_method_id) const OVERRIDE; - virtual size_t GetNumActiveInputMethods() const OVERRIDE; + const std::string& input_method_id) const override; + virtual size_t GetNumActiveInputMethods() const override; virtual void SetEnabledExtensionImes( - std::vector<std::string>* ids) OVERRIDE; - virtual void SetInputMethodLoginDefault() OVERRIDE; + std::vector<std::string>* ids) override; + virtual void SetInputMethodLoginDefault() override; virtual void SetInputMethodLoginDefaultFromVPD( const std::string& locale, - const std::string& layout) OVERRIDE; - virtual bool SwitchToNextInputMethod() OVERRIDE; + const std::string& layout) override; + virtual bool SwitchToNextInputMethod() override; virtual bool SwitchToPreviousInputMethod( - const ui::Accelerator& accelerator) OVERRIDE; - virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE; - virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE; + const ui::Accelerator& accelerator) override; + virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) override; + virtual InputMethodDescriptor GetCurrentInputMethod() const override; virtual bool ReplaceEnabledInputMethods( - const std::vector<std::string>& new_active_input_method_ids) OVERRIDE; + const std::vector<std::string>& new_active_input_method_ids) override; // The value GetCurrentInputMethod().id() will return. std::string current_input_method_id; @@ -77,30 +77,30 @@ class MockInputMethodManager : public InputMethodManager { virtual ~MockInputMethodManager(); // InputMethodManager override: - virtual UISessionState GetUISessionState() OVERRIDE; - virtual void AddObserver(InputMethodManager::Observer* observer) OVERRIDE; + virtual UISessionState GetUISessionState() override; + virtual void AddObserver(InputMethodManager::Observer* observer) override; virtual void AddCandidateWindowObserver( - InputMethodManager::CandidateWindowObserver* observer) OVERRIDE; - virtual void RemoveObserver(InputMethodManager::Observer* observer) OVERRIDE; + InputMethodManager::CandidateWindowObserver* observer) override; + virtual void RemoveObserver(InputMethodManager::Observer* observer) override; virtual void RemoveCandidateWindowObserver( - InputMethodManager::CandidateWindowObserver* observer) OVERRIDE; + InputMethodManager::CandidateWindowObserver* observer) override; virtual scoped_ptr<InputMethodDescriptors> - GetSupportedInputMethods() const OVERRIDE; - virtual void ActivateInputMethodMenuItem(const std::string& key) OVERRIDE; - virtual bool IsISOLevel5ShiftUsedByCurrentInputMethod() const OVERRIDE; - virtual bool IsAltGrUsedByCurrentInputMethod() const OVERRIDE; - virtual ImeKeyboard* GetImeKeyboard() OVERRIDE; - virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE; + GetSupportedInputMethods() const override; + virtual void ActivateInputMethodMenuItem(const std::string& key) override; + virtual bool IsISOLevel5ShiftUsedByCurrentInputMethod() const override; + virtual bool IsAltGrUsedByCurrentInputMethod() const override; + virtual ImeKeyboard* GetImeKeyboard() override; + virtual InputMethodUtil* GetInputMethodUtil() override; virtual ComponentExtensionIMEManager* - GetComponentExtensionIMEManager() OVERRIDE; - virtual bool IsLoginKeyboard(const std::string& layout) const OVERRIDE; + GetComponentExtensionIMEManager() override; + virtual bool IsLoginKeyboard(const std::string& layout) const override; virtual bool MigrateInputMethods( - std::vector<std::string>* input_method_ids) OVERRIDE; + std::vector<std::string>* input_method_ids) override; virtual scoped_refptr<InputMethodManager::State> CreateNewState( - Profile* profile) OVERRIDE; - virtual scoped_refptr<InputMethodManager::State> GetActiveIMEState() OVERRIDE; + Profile* profile) override; + virtual scoped_refptr<InputMethodManager::State> GetActiveIMEState() override; virtual void SetState( - scoped_refptr<InputMethodManager::State> state) OVERRIDE; + scoped_refptr<InputMethodManager::State> state) override; // Sets an input method ID which will be returned by GetCurrentInputMethod(). void SetCurrentInputMethodId(const std::string& input_method_id); diff --git a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc index 5731558..92fbb52 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc +++ b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc @@ -59,7 +59,7 @@ class ScopedModeIndicatorObserverForTesting : } // ModeIndicatorObserverInterface override: - virtual void AddModeIndicatorWidget(views::Widget* widget) OVERRIDE { + virtual void AddModeIndicatorWidget(views::Widget* widget) override { widget_list_.push_back(widget); max_widget_list_size_ = std::max(max_widget_list_size_, widget_list_.size()); @@ -67,7 +67,7 @@ class ScopedModeIndicatorObserverForTesting : } // views::WidgetObserver override: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE { + virtual void OnWidgetDestroying(views::Widget* widget) override { std::vector<views::Widget*>::iterator it = std::find(widget_list_.begin(), widget_list_.end(), widget); if (it != widget_list_.end()) @@ -76,7 +76,7 @@ class ScopedModeIndicatorObserverForTesting : // views::WidgetObserver override: virtual void OnWidgetVisibilityChanged(views::Widget* widget, - bool visible) OVERRIDE { + bool visible) override { last_bounds_ = widget->GetWindowBoundsInScreen(); is_displayed_ |= visible; } @@ -94,7 +94,7 @@ class ModeIndicatorBrowserTest : public InProcessBrowserTest { : InProcessBrowserTest() {} virtual ~ModeIndicatorBrowserTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ui::SetUpInputMethodFactoryForTesting(); } diff --git a/chrome/browser/chromeos/input_method/mode_indicator_controller.cc b/chrome/browser/chromeos/input_method/mode_indicator_controller.cc index 30bcc4e..3354ccf 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_controller.cc +++ b/chrome/browser/chromeos/input_method/mode_indicator_controller.cc @@ -31,7 +31,7 @@ class ModeIndicatorObserver : public ModeIndicatorObserverInterface { // If other active mode indicator widget is shown, close it immedicately // without fading animation. Then store this widget as the active widget. - virtual void AddModeIndicatorWidget(views::Widget* widget) OVERRIDE { + virtual void AddModeIndicatorWidget(views::Widget* widget) override { DCHECK(widget); if (active_widget_) active_widget_->Close(); @@ -40,7 +40,7 @@ class ModeIndicatorObserver : public ModeIndicatorObserverInterface { } // views::WidgetObserver override: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE { + virtual void OnWidgetDestroying(views::Widget* widget) override { if (widget == active_widget_) active_widget_ = NULL; } diff --git a/chrome/browser/chromeos/input_method/mode_indicator_controller.h b/chrome/browser/chromeos/input_method/mode_indicator_controller.h index 9023c6c..502ff5a 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_controller.h +++ b/chrome/browser/chromeos/input_method/mode_indicator_controller.h @@ -47,7 +47,7 @@ class ModeIndicatorController private: // InputMethodManager::Observer implementation. virtual void InputMethodChanged(InputMethodManager* manager, - bool show_message) OVERRIDE; + bool show_message) override; // Show the mode inidicator with the current ime's short name if all // the conditions are cleared. diff --git a/chrome/browser/chromeos/input_method/textinput_test_helper.h b/chrome/browser/chromeos/input_method/textinput_test_helper.h index 2b97425..7fdafcb 100644 --- a/chrome/browser/chromeos/input_method/textinput_test_helper.h +++ b/chrome/browser/chromeos/input_method/textinput_test_helper.h @@ -23,7 +23,7 @@ class TextInputTestBase : public InProcessBrowserTest { TextInputTestBase() {} virtual ~TextInputTestBase() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; + virtual void SetUpInProcessBrowserTestFixture() override; private: DISALLOW_COPY_AND_ASSIGN(TextInputTestBase); }; @@ -72,15 +72,15 @@ class TextInputTestHelper : public ui::InputMethodObserver { // ui::InputMethodObserver overrides. virtual void OnTextInputTypeChanged( - const ui::TextInputClient* client) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; - virtual void OnCaretBoundsChanged(const ui::TextInputClient* client) OVERRIDE; + const ui::TextInputClient* client) override; + virtual void OnFocus() override; + virtual void OnBlur() override; + virtual void OnCaretBoundsChanged(const ui::TextInputClient* client) override; virtual void OnTextInputStateChanged( - const ui::TextInputClient* client) OVERRIDE; - virtual void OnShowImeIfNeeded() OVERRIDE; + const ui::TextInputClient* client) override; + virtual void OnShowImeIfNeeded() override; virtual void OnInputMethodDestroyed( - const ui::InputMethod* input_method) OVERRIDE; + const ui::InputMethod* input_method) override; // Represents waiting type of text input event. WaitImeEventType waiting_type_; diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h index 9f9c63f..747a8be 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h @@ -31,10 +31,10 @@ class KioskModeIdleLogout : public wm::UserActivityObserver, // Overridden from content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // wm::UserActivityObserver overrides: - virtual void OnUserActivity(const ui::Event* event) OVERRIDE; + virtual void OnUserActivity(const ui::Event* event) override; // Begins listening for user activity and calls ResetTimer(). void Start(); diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc index 8843dca..3f82440 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc @@ -26,12 +26,12 @@ class KioskModeIdleLogoutTest : public ash::test::AshTestBase { : idle_logout_(NULL) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); idle_logout_ = new KioskModeIdleLogout(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { delete idle_logout_; AshTestBase::TearDown(); } diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc index 0ef085c..e7b7e15 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc @@ -70,8 +70,8 @@ class ScreensaverUnpackerClient const base::FilePath& extension_root, const base::DictionaryValue* original_manifest, const Extension* extension, - const SkBitmap& install_icon) OVERRIDE; - virtual void OnUnpackFailure(const base::string16& error) OVERRIDE; + const SkBitmap& install_icon) override; + virtual void OnUnpackFailure(const base::string16& error) override; protected: virtual ~ScreensaverUnpackerClient() {} diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h index d64e9c7..d6ea257 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h @@ -25,7 +25,7 @@ class KioskModeScreensaver : public wm::UserActivityObserver { friend class KioskModeScreensaverTest; // wm::UserActivityObserver overrides: - virtual void OnUserActivity(const ui::Event* event) OVERRIDE; + virtual void OnUserActivity(const ui::Event* event) override; // Initialization functions, in order // Get the screensaver path once KioskModeHelper is initialized. diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc index 587aacf..cf69b93 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc @@ -47,7 +47,7 @@ class KioskModeSettingsTest : public testing::Test { cros_settings->AddSettingsProvider(device_settings_provider_); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { if (!KioskModeSettings::Get()->is_initialized()) { KioskModeSettings::Get()->Initialize( base::Bind(&KioskModeSettingsTest::SetUp, @@ -56,7 +56,7 @@ class KioskModeSettingsTest : public testing::Test { } } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { KioskModeSettings::Get()->set_initialized(false); } diff --git a/chrome/browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h b/chrome/browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h index 539fde7..7481c73 100644 --- a/chrome/browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h +++ b/chrome/browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h @@ -34,17 +34,17 @@ class MockKioskModeSettings : public KioskModeSettings { MockKioskModeSettings(); virtual ~MockKioskModeSettings(); - virtual bool IsKioskModeEnabled() OVERRIDE; + virtual bool IsKioskModeEnabled() override; // Initialize the mock class. - virtual void Initialize(const base::Closure& notify_initialized) OVERRIDE; - virtual bool is_initialized() const OVERRIDE; + virtual void Initialize(const base::Closure& notify_initialized) override; + virtual bool is_initialized() const override; // The time to logout the user in on idle. - virtual base::TimeDelta GetIdleLogoutTimeout() const OVERRIDE; + virtual base::TimeDelta GetIdleLogoutTimeout() const override; // The time to show the countdown timer for. - virtual base::TimeDelta GetIdleLogoutWarningDuration() const OVERRIDE; + virtual base::TimeDelta GetIdleLogoutWarningDuration() const override; private: friend struct base::DefaultLazyInstanceTraits<MockKioskModeSettings>; diff --git a/chrome/browser/chromeos/locale_change_guard.h b/chrome/browser/chromeos/locale_change_guard.h index e187434..483dfbe 100644 --- a/chrome/browser/chromeos/locale_change_guard.h +++ b/chrome/browser/chromeos/locale_change_guard.h @@ -37,8 +37,8 @@ class LocaleChangeGuard : public content::NotificationObserver, virtual ~LocaleChangeGuard(); // ash::LocaleChangeDelegate implementation. - virtual void AcceptLocaleChange() OVERRIDE; - virtual void RevertLocaleChange() OVERRIDE; + virtual void AcceptLocaleChange() override; + virtual void RevertLocaleChange() override; // Called just before changing locale. void PrepareChangingLocale( @@ -59,7 +59,7 @@ class LocaleChangeGuard : public content::NotificationObserver, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Returns true if we should notify user about automatic locale change. static bool ShouldShowLocaleChangeNotification(const std::string& from_locale, diff --git a/chrome/browser/chromeos/login/app_launch_controller.cc b/chrome/browser/chromeos/login/app_launch_controller.cc index 32263f6..fa62009 100644 --- a/chrome/browser/chromeos/login/app_launch_controller.cc +++ b/chrome/browser/chromeos/login/app_launch_controller.cc @@ -82,7 +82,7 @@ class AppLaunchController::AppWindowWatcher private: // extensions::AppWindowRegistry::Observer overrides: - virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE { + virtual void OnAppWindowAdded(extensions::AppWindow* app_window) override { if (app_window->extension_id() == app_id_) { window_registry_->RemoveObserver(this); NotifyAppWindowCreated(); diff --git a/chrome/browser/chromeos/login/app_launch_controller.h b/chrome/browser/chromeos/login/app_launch_controller.h index a585b2c..74a58e9 100644 --- a/chrome/browser/chromeos/login/app_launch_controller.h +++ b/chrome/browser/chromeos/login/app_launch_controller.h @@ -81,33 +81,33 @@ class AppLaunchController void MaybeShowNetworkConfigureUI(); // KioskProfileLoader::Delegate overrides: - virtual void OnProfileLoaded(Profile* profile) OVERRIDE; - virtual void OnProfileLoadFailed(KioskAppLaunchError::Error error) OVERRIDE; + virtual void OnProfileLoaded(Profile* profile) override; + virtual void OnProfileLoadFailed(KioskAppLaunchError::Error error) override; // AppLaunchSplashScreenActor::Delegate overrides: - virtual void OnConfigureNetwork() OVERRIDE; - virtual void OnCancelAppLaunch() OVERRIDE; - virtual void OnNetworkConfigRequested(bool requested) OVERRIDE; - virtual void OnNetworkStateChanged(bool online) OVERRIDE; + virtual void OnConfigureNetwork() override; + virtual void OnCancelAppLaunch() override; + virtual void OnNetworkConfigRequested(bool requested) override; + virtual void OnNetworkStateChanged(bool online) override; // StartupAppLauncher::Delegate overrides: - virtual void InitializeNetwork() OVERRIDE; - virtual bool IsNetworkReady() OVERRIDE; - virtual void OnLoadingOAuthFile() OVERRIDE; - virtual void OnInitializingTokenService() OVERRIDE; - virtual void OnInstallingApp() OVERRIDE; - virtual void OnReadyToLaunch() OVERRIDE; - virtual void OnLaunchSucceeded() OVERRIDE; - virtual void OnLaunchFailed(KioskAppLaunchError::Error error) OVERRIDE; - virtual bool IsShowingNetworkConfigScreen() OVERRIDE; + virtual void InitializeNetwork() override; + virtual bool IsNetworkReady() override; + virtual void OnLoadingOAuthFile() override; + virtual void OnInitializingTokenService() override; + virtual void OnInstallingApp() override; + virtual void OnReadyToLaunch() override; + virtual void OnLaunchSucceeded() override; + virtual void OnLaunchFailed(KioskAppLaunchError::Error error) override; + virtual bool IsShowingNetworkConfigScreen() override; // AppLaunchSigninScreen::Delegate overrides: - virtual void OnOwnerSigninSuccess() OVERRIDE; + virtual void OnOwnerSigninSuccess() override; // content::NotificationObserver overrides: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; Profile* profile_; const std::string app_id_; diff --git a/chrome/browser/chromeos/login/app_launch_signin_screen.h b/chrome/browser/chromeos/login/app_launch_signin_screen.h index 2fbcf66..e12b41f 100644 --- a/chrome/browser/chromeos/login/app_launch_signin_screen.h +++ b/chrome/browser/chromeos/login/app_launch_signin_screen.h @@ -50,43 +50,43 @@ class AppLaunchSigninScreen : public SigninScreenHandlerDelegate, user_manager::UserManager* GetUserManager(); // SigninScreenHandlerDelegate implementation: - virtual void CancelPasswordChangedFlow() OVERRIDE; - virtual void CancelUserAdding() OVERRIDE; - virtual void CreateAccount() OVERRIDE; - virtual void CompleteLogin(const UserContext& user_context) OVERRIDE; + virtual void CancelPasswordChangedFlow() override; + virtual void CancelUserAdding() override; + virtual void CreateAccount() override; + virtual void CompleteLogin(const UserContext& user_context) override; virtual void Login(const UserContext& user_context, - const SigninSpecifics& specifics) OVERRIDE; - virtual void MigrateUserData(const std::string& old_password) OVERRIDE; - virtual void LoadWallpaper(const std::string& username) OVERRIDE; - virtual void LoadSigninWallpaper() OVERRIDE; - virtual void OnSigninScreenReady() OVERRIDE; - virtual void RemoveUser(const std::string& username) OVERRIDE; - virtual void ResyncUserData() OVERRIDE; - virtual void ShowEnterpriseEnrollmentScreen() OVERRIDE; - virtual void ShowKioskEnableScreen() OVERRIDE; - virtual void ShowKioskAutolaunchScreen() OVERRIDE; - virtual void ShowWrongHWIDScreen() OVERRIDE; + const SigninSpecifics& specifics) override; + virtual void MigrateUserData(const std::string& old_password) override; + virtual void LoadWallpaper(const std::string& username) override; + virtual void LoadSigninWallpaper() override; + virtual void OnSigninScreenReady() override; + virtual void RemoveUser(const std::string& username) override; + virtual void ResyncUserData() override; + virtual void ShowEnterpriseEnrollmentScreen() override; + virtual void ShowKioskEnableScreen() override; + virtual void ShowKioskAutolaunchScreen() override; + virtual void ShowWrongHWIDScreen() override; virtual void SetWebUIHandler( - LoginDisplayWebUIHandler* webui_handler) OVERRIDE; + LoginDisplayWebUIHandler* webui_handler) override; virtual void ShowSigninScreenForCreds(const std::string& username, const std::string& password); - virtual const user_manager::UserList& GetUsers() const OVERRIDE; - virtual bool IsShowGuest() const OVERRIDE; - virtual bool IsShowUsers() const OVERRIDE; - virtual bool IsSigninInProgress() const OVERRIDE; - virtual bool IsUserSigninCompleted() const OVERRIDE; - virtual void SetDisplayEmail(const std::string& email) OVERRIDE; - virtual void Signout() OVERRIDE; - virtual void HandleGetUsers() OVERRIDE; + virtual const user_manager::UserList& GetUsers() const override; + virtual bool IsShowGuest() const override; + virtual bool IsShowUsers() const override; + virtual bool IsSigninInProgress() const override; + virtual bool IsUserSigninCompleted() const override; + virtual void SetDisplayEmail(const std::string& email) override; + virtual void Signout() override; + virtual void HandleGetUsers() override; virtual void SetAuthType( const std::string& username, - ScreenlockBridge::LockHandler::AuthType auth_type) OVERRIDE; + ScreenlockBridge::LockHandler::AuthType auth_type) override; virtual ScreenlockBridge::LockHandler::AuthType GetAuthType( - const std::string& username) const OVERRIDE; + const std::string& username) const override; // AuthStatusConsumer implementation: - virtual void OnAuthFailure(const AuthFailure& error) OVERRIDE; - virtual void OnAuthSuccess(const UserContext& user_context) OVERRIDE; + virtual void OnAuthFailure(const AuthFailure& error) override; + virtual void OnAuthSuccess(const UserContext& user_context) override; OobeUI* oobe_ui_; Delegate* delegate_; diff --git a/chrome/browser/chromeos/login/auth/auth_prewarmer.h b/chrome/browser/chromeos/login/auth/auth_prewarmer.h index 99903fc..132b446 100644 --- a/chrome/browser/chromeos/login/auth/auth_prewarmer.h +++ b/chrome/browser/chromeos/login/auth/auth_prewarmer.h @@ -30,12 +30,12 @@ class AuthPrewarmer : public NetworkStateHandlerObserver, private: // chromeos::NetworkStateHandlerObserver overrides. - virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE; + virtual void DefaultNetworkChanged(const NetworkState* network) override; // content::NotificationObserver overrides. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; bool IsNetworkConnected() const; net::URLRequestContextGetter* GetRequestContext() const; diff --git a/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h b/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h index d90126f..e3b97af 100644 --- a/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h +++ b/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h @@ -18,10 +18,10 @@ class ChromeCryptohomeAuthenticator : public CryptohomeAuthenticator { protected: virtual ~ChromeCryptohomeAuthenticator(); - virtual bool IsKnownUser(const UserContext& context) OVERRIDE; - virtual bool IsSafeMode() OVERRIDE; + virtual bool IsKnownUser(const UserContext& context) override; + virtual bool IsSafeMode() override; virtual void CheckSafeModeOwnership(const UserContext& context, - const IsOwnerCallback& callback) OVERRIDE; + const IsOwnerCallback& callback) override; private: DISALLOW_COPY_AND_ASSIGN(ChromeCryptohomeAuthenticator); diff --git a/chrome/browser/chromeos/login/auth/login_performer.h b/chrome/browser/chromeos/login/auth/login_performer.h index 4bf175b..00d6ace 100644 --- a/chrome/browser/chromeos/login/auth/login_performer.h +++ b/chrome/browser/chromeos/login/auth/login_performer.h @@ -57,12 +57,12 @@ class LoginPerformer : public AuthStatusConsumer, virtual ~LoginPerformer(); // AuthStatusConsumer implementation: - virtual void OnAuthFailure(const AuthFailure& error) OVERRIDE; + virtual void OnAuthFailure(const AuthFailure& error) override; virtual void OnRetailModeAuthSuccess( - const UserContext& user_context) OVERRIDE; - virtual void OnAuthSuccess(const UserContext& user_context) OVERRIDE; - virtual void OnOffTheRecordAuthSuccess() OVERRIDE; - virtual void OnPasswordChangeDetected() OVERRIDE; + const UserContext& user_context) override; + virtual void OnAuthSuccess(const UserContext& user_context) override; + virtual void OnOffTheRecordAuthSuccess() override; + virtual void OnPasswordChangeDetected() override; // Performs a login for |user_context|. // If auth_mode is AUTH_MODE_EXTENSION, there are no further auth checks, @@ -115,7 +115,7 @@ class LoginPerformer : public AuthStatusConsumer, protected: // Implements OnlineAttemptHost::Delegate. - virtual void OnChecked(const std::string& username, bool success) OVERRIDE; + virtual void OnChecked(const std::string& username, bool success) override; private: // Starts login completion of externally authenticated user. diff --git a/chrome/browser/chromeos/login/auth/online_attempt_unittest.cc b/chrome/browser/chromeos/login/auth/online_attempt_unittest.cc index 73a5350..660d7fe 100644 --- a/chrome/browser/chromeos/login/auth/online_attempt_unittest.cc +++ b/chrome/browser/chromeos/login/auth/online_attempt_unittest.cc @@ -37,12 +37,12 @@ class TestContextURLRequestContextGetter : public net::URLRequestContextGetter { TestContextURLRequestContextGetter() : null_task_runner_(new base::NullTaskRunner) {} - virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE { + virtual net::URLRequestContext* GetURLRequestContext() override { return &context_; } virtual scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() - const OVERRIDE { + const override { return null_task_runner_; } @@ -63,7 +63,7 @@ class OnlineAttemptTest : public testing::Test { : state_(UserContext(), false), attempt_(new OnlineAttempt(&state_, &resolver_)) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { message_loop_ = base::MessageLoopProxy::current(); request_context_ = new TestContextURLRequestContextGetter(); } diff --git a/chrome/browser/chromeos/login/crash_restore_browsertest.cc b/chrome/browser/chromeos/login/crash_restore_browsertest.cc index 2f01bfe..04371a4 100644 --- a/chrome/browser/chromeos/login/crash_restore_browsertest.cc +++ b/chrome/browser/chromeos/login/crash_restore_browsertest.cc @@ -37,14 +37,14 @@ class CrashRestoreSimpleTest : public InProcessBrowserTest { virtual ~CrashRestoreSimpleTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII(switches::kLoginUser, kUserId1); command_line->AppendSwitchASCII( switches::kLoginProfile, CryptohomeClient::GetStubSanitizedUsername(kUserId1)); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { // Redirect session_manager DBus calls to FakeSessionManagerClient. session_manager_client_ = new FakeSessionManagerClient; chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( @@ -77,7 +77,7 @@ class UserSessionRestoreObserver : public UserSessionStateObserver { } virtual ~UserSessionRestoreObserver() {} - virtual void PendingUserSessionsRestoreFinished() OVERRIDE { + virtual void PendingUserSessionsRestoreFinished() override { user_sessions_restored_ = true; UserSessionManager::GetInstance()->RemoveSessionStateObserver(this); if (!running_loop_) @@ -112,7 +112,7 @@ class CrashRestoreComplexTest : public CrashRestoreSimpleTest { CrashRestoreComplexTest() {} virtual ~CrashRestoreComplexTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { CrashRestoreSimpleTest::SetUpInProcessBrowserTestFixture(); session_manager_client_->StartSession(kUserId2); session_manager_client_->StartSession(kUserId3); diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h index 9abd6b3..3809807 100644 --- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h +++ b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h @@ -36,8 +36,8 @@ class DemoAppLauncher : public KioskProfileLoader::Delegate { friend class DemoAppLauncherTest; // KioskProfileLoader::Delegate overrides: - virtual void OnProfileLoaded(Profile* profile) OVERRIDE; - virtual void OnProfileLoadFailed(KioskAppLaunchError::Error error) OVERRIDE; + virtual void OnProfileLoaded(Profile* profile) override; + virtual void OnProfileLoadFailed(KioskAppLaunchError::Error error) override; scoped_ptr<KioskProfileLoader> kiosk_profile_loader_; diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc index 9e5b88a..a4ec47f 100644 --- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc +++ b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc @@ -66,7 +66,7 @@ class DemoAppLauncherTest : public ExtensionBrowserTest { virtual ~DemoAppLauncherTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kLoginManager); command_line->AppendSwitch(switches::kForceLoginManagerInTests); command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); @@ -76,7 +76,7 @@ class DemoAppLauncherTest : public ExtensionBrowserTest { command_line->AppendSwitchASCII(switches::kDerelictDetectionTimeout, "0"); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { chromeos::DemoAppLauncher::SetDemoAppPathForTesting(GetTestDemoAppPath()); ExtensionBrowserTest::SetUp(); } diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h index 1c924da..5d227dd 100644 --- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h +++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h @@ -45,19 +45,19 @@ class AutoEnrollmentCheckScreen } // WizardScreen implementation: - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // AutoEnrollmentCheckScreenActor::Delegate implementation: - virtual void OnExit() OVERRIDE; - virtual void OnActorDestroyed(AutoEnrollmentCheckScreenActor* actor) OVERRIDE; + virtual void OnExit() override; + virtual void OnActorDestroyed(AutoEnrollmentCheckScreenActor* actor) override; // NetworkPortalDetector::Observer implementation: virtual void OnPortalDetectionCompleted( const NetworkState* network, - const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE; + const NetworkPortalDetector::CaptivePortalState& state) override; private: // Handles update notifications regarding the auto-enrollment check. diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h index 912462a..af1c3e5 100644 --- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h +++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h @@ -56,27 +56,27 @@ class EnrollmentScreen pairing_chromeos::HostPairingController* remora_controller); // WizardScreen implementation: - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // pairing_chromeos::HostPairingController::Observer: - virtual void PairingStageChanged(Stage new_stage) OVERRIDE; + virtual void PairingStageChanged(Stage new_stage) override; virtual void ConfigureHost(bool accepted_eula, const std::string& lang, const std::string& timezone, bool send_reports, - const std::string& keyboard_layout) OVERRIDE; - virtual void EnrollHost(const std::string& auth_token) OVERRIDE; + const std::string& keyboard_layout) override; + virtual void EnrollHost(const std::string& auth_token) override; // EnrollmentScreenActor::Controller implementation: - virtual void OnLoginDone(const std::string& user) OVERRIDE; - virtual void OnAuthError(const GoogleServiceAuthError& error) OVERRIDE; - virtual void OnOAuthTokenAvailable(const std::string& oauth_token) OVERRIDE; - virtual void OnRetry() OVERRIDE; - virtual void OnCancel() OVERRIDE; - virtual void OnConfirmationClosed() OVERRIDE; + virtual void OnLoginDone(const std::string& user) override; + virtual void OnAuthError(const GoogleServiceAuthError& error) override; + virtual void OnOAuthTokenAvailable(const std::string& oauth_token) override; + virtual void OnRetry() override; + virtual void OnCancel() override; + virtual void OnConfirmationClosed() override; // Used for testing. EnrollmentScreenActor* GetActor() { diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc index ea3ff85..36af5f8 100644 --- a/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc @@ -91,7 +91,7 @@ class ProvisionedEnrollmentScreenTest : public EnrollmentScreenTest { private: // Overridden from InProcessBrowserTest: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { base::FilePath test_data_dir; ASSERT_TRUE(chromeos::test_utils::GetTestDataPath( "app_mode", "kiosk_manifest", &test_data_dir)); diff --git a/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h b/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h index 3df1886..bcf91c0 100644 --- a/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h +++ b/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h @@ -25,7 +25,7 @@ class MockAutoEnrollmentCheckScreenActor MockAutoEnrollmentCheckScreenActor(); virtual ~MockAutoEnrollmentCheckScreenActor(); - virtual void SetDelegate(Delegate* screen) OVERRIDE; + virtual void SetDelegate(Delegate* screen) override; MOCK_METHOD1(MockSetDelegate, void(Delegate* screen)); MOCK_METHOD0(Show, void()); diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h index 6fedb17..cd4e90b 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.h +++ b/chrome/browser/chromeos/login/existing_user_controller.h @@ -80,23 +80,23 @@ class ExistingUserController : public LoginDisplay::Delegate, void StopPublicSessionAutoLoginTimer(); // LoginDisplay::Delegate: implementation - virtual void CancelPasswordChangedFlow() OVERRIDE; - virtual void CreateAccount() OVERRIDE; - virtual void CompleteLogin(const UserContext& user_context) OVERRIDE; - virtual base::string16 GetConnectedNetworkName() OVERRIDE; - virtual bool IsSigninInProgress() const OVERRIDE; + virtual void CancelPasswordChangedFlow() override; + virtual void CreateAccount() override; + virtual void CompleteLogin(const UserContext& user_context) override; + virtual base::string16 GetConnectedNetworkName() override; + virtual bool IsSigninInProgress() const override; virtual void Login(const UserContext& user_context, - const SigninSpecifics& specifics) OVERRIDE; - virtual void MigrateUserData(const std::string& old_password) OVERRIDE; - virtual void OnSigninScreenReady() OVERRIDE; - virtual void OnStartEnterpriseEnrollment() OVERRIDE; - virtual void OnStartKioskEnableScreen() OVERRIDE; - virtual void OnStartKioskAutolaunchScreen() OVERRIDE; - virtual void ResetPublicSessionAutoLoginTimer() OVERRIDE; - virtual void ResyncUserData() OVERRIDE; - virtual void SetDisplayEmail(const std::string& email) OVERRIDE; - virtual void ShowWrongHWIDScreen() OVERRIDE; - virtual void Signout() OVERRIDE; + const SigninSpecifics& specifics) override; + virtual void MigrateUserData(const std::string& old_password) override; + virtual void OnSigninScreenReady() override; + virtual void OnStartEnterpriseEnrollment() override; + virtual void OnStartKioskEnableScreen() override; + virtual void OnStartKioskAutolaunchScreen() override; + virtual void ResetPublicSessionAutoLoginTimer() override; + virtual void ResyncUserData() override; + virtual void SetDisplayEmail(const std::string& email) override; + virtual void ShowWrongHWIDScreen() override; + virtual void Signout() override; void LoginAsRetailModeUser(); void LoginAsGuest(); @@ -106,7 +106,7 @@ class ExistingUserController : public LoginDisplay::Delegate, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Set a delegate that we will pass AuthStatusConsumer events to. // Used for testing. @@ -146,17 +146,17 @@ class ExistingUserController : public LoginDisplay::Delegate, void OnPublicSessionAutoLoginTimerFire(); // LoginPerformer::Delegate implementation: - virtual void OnAuthFailure(const AuthFailure& error) OVERRIDE; - virtual void OnAuthSuccess(const UserContext& user_context) OVERRIDE; - virtual void OnOffTheRecordAuthSuccess() OVERRIDE; - virtual void OnPasswordChangeDetected() OVERRIDE; - virtual void WhiteListCheckFailed(const std::string& email) OVERRIDE; - virtual void PolicyLoadFailed() OVERRIDE; + virtual void OnAuthFailure(const AuthFailure& error) override; + virtual void OnAuthSuccess(const UserContext& user_context) override; + virtual void OnOffTheRecordAuthSuccess() override; + virtual void OnPasswordChangeDetected() override; + virtual void WhiteListCheckFailed(const std::string& email) override; + virtual void PolicyLoadFailed() override; virtual void OnOnlineChecked( - const std::string& username, bool success) OVERRIDE; + const std::string& username, bool success) override; // LoginUtils::Delegate implementation: - virtual void OnProfilePrepared(Profile* profile) OVERRIDE; + virtual void OnProfilePrepared(Profile* profile) override; // Called when device settings change. void DeviceSettingsChanged(); diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc index 2758b95..c134141 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc @@ -94,7 +94,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest { return ExistingUserController::current_controller(); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { SetUpSessionManager(); DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture(); @@ -125,7 +125,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest { .Times(1); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kLoginManager); } @@ -162,7 +162,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest { .Times(1); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { testing_profile_.reset(new TestingProfile()); SetUpUserManager(); existing_user_controller_.reset( @@ -175,7 +175,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest { testing_profile_.get()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { // ExistingUserController must be deleted before the thread is cleaned up: // If there is an outstanding login attempt when ExistingUserController is // deleted, its LoginPerformer instance will be deleted, which in turn @@ -347,7 +347,7 @@ class ExistingUserControllerPublicSessionTest policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)) { } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExistingUserControllerTest::SetUpOnMainThread(); // Wait for the public session user to be created. @@ -382,7 +382,7 @@ class ExistingUserControllerPublicSessionTest } } - virtual void SetUpSessionManager() OVERRIDE { + virtual void SetUpSessionManager() override { InstallOwnerKey(); // Setup the device policy. @@ -408,7 +408,7 @@ class ExistingUserControllerPublicSessionTest device_local_account_policy.GetBlob()); } - virtual void SetUpLoginDisplay() OVERRIDE { + virtual void SetUpLoginDisplay() override { EXPECT_CALL(*mock_login_display_host_.get(), CreateLoginDisplay(_)) .Times(1) .WillOnce(Return(mock_login_display_)); @@ -421,7 +421,7 @@ class ExistingUserControllerPublicSessionTest .Times(AnyNumber()); } - virtual void SetUpUserManager() OVERRIDE { + virtual void SetUpUserManager() override { } void ExpectSuccessfulLogin(const UserContext& user_context) { diff --git a/chrome/browser/chromeos/login/fake_login_utils.h b/chrome/browser/chromeos/login/fake_login_utils.h index 01bb087..a9fdef1 100644 --- a/chrome/browser/chromeos/login/fake_login_utils.h +++ b/chrome/browser/chromeos/login/fake_login_utils.h @@ -22,19 +22,19 @@ class FakeLoginUtils : public LoginUtils { FakeLoginUtils(); virtual ~FakeLoginUtils(); virtual void RespectLocalePreference(Profile*, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; virtual void DoBrowserLaunch(Profile* profile, - LoginDisplayHost* login_host) OVERRIDE; + LoginDisplayHost* login_host) override; virtual void PrepareProfile(const UserContext& user_context, bool has_cookies, bool has_active_session, - LoginUtils::Delegate* delegate) OVERRIDE; - virtual void DelegateDeleted(LoginUtils::Delegate* delegate) OVERRIDE; - virtual void CompleteOffTheRecordLogin(const GURL& start_url) OVERRIDE; + LoginUtils::Delegate* delegate) override; + virtual void DelegateDeleted(LoginUtils::Delegate* delegate) override; + virtual void CompleteOffTheRecordLogin(const GURL& start_url) override; virtual scoped_refptr<Authenticator> CreateAuthenticator( - AuthStatusConsumer* consumer) OVERRIDE; + AuthStatusConsumer* consumer) override; virtual bool RestartToApplyPerSessionFlagsIfNeed(Profile* profile, - bool early_restart) OVERRIDE; + bool early_restart) override; void SetExpectedCredentials(const UserContext& user_context); void set_should_launch_browser(bool should_launch_browser) { diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc index fde63ed..b3a7417 100644 --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc @@ -296,7 +296,7 @@ class KioskTest : public OobeBaseTest { virtual ~KioskTest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test_app_id_ = kTestKioskApp; set_test_app_version("1.0.0"); set_test_crx_file(test_app_id() + ".crx"); @@ -309,19 +309,19 @@ class KioskTest : public OobeBaseTest { OobeBaseTest::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(false); OobeBaseTest::TearDown(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { OobeBaseTest::SetUpOnMainThread(); // Needed to avoid showing Gaia screen instead of owner signin for // consumer network down test cases. StartupUtils::MarkDeviceRegistered(base::Closure()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { AppLaunchController::SetNetworkTimeoutCallbackForTesting(NULL); AppLaunchSigninScreen::SetUserManagerForTesting(NULL); @@ -332,7 +332,7 @@ class KioskTest : public OobeBaseTest { KioskAppManager::Get()->CleanUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { OobeBaseTest::SetUpCommandLine(command_line); fake_cws_->Init(embedded_test_server()); } @@ -1046,20 +1046,20 @@ class KioskUpdateTest : public KioskTest { virtual ~KioskUpdateTest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { fake_disk_mount_manager_ = new KioskFakeDiskMountManager(); disks::DiskMountManager::InitializeForTesting(fake_disk_mount_manager_); KioskTest::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { disks::DiskMountManager::Shutdown(); KioskTest::TearDown(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { KioskTest::SetUpOnMainThread(); } @@ -1160,13 +1160,13 @@ class KioskUpdateTest : public KioskTest { private: // KioskAppManagerObserver overrides: - virtual void OnKioskAppCacheUpdated(const std::string& app_id) OVERRIDE { + virtual void OnKioskAppCacheUpdated(const std::string& app_id) override { if (app_id_ != app_id) return; app_update_notified_ = true; } - virtual void OnKioskAppExternalUpdateComplete(bool success) OVERRIDE { + virtual void OnKioskAppExternalUpdateComplete(bool success) override { quit_ = true; update_success_ = success; if (runner_.get()) @@ -1212,7 +1212,7 @@ class KioskUpdateTest : public KioskTest { private: // KioskAppManagerObserver overrides: virtual void OnKioskExtensionLoadedInCache( - const std::string& app_id) OVERRIDE { + const std::string& app_id) override { std::string cached_version; base::FilePath file_path; if (!manager_->GetCachedCrx(app_id_, &file_path, &cached_version)) @@ -1226,7 +1226,7 @@ class KioskUpdateTest : public KioskTest { } virtual void OnKioskExtensionDownloadFailed( - const std::string& app_id) OVERRIDE { + const std::string& app_id) override { loaded_ = false; quit_ = true; if (runner_.get()) @@ -1558,14 +1558,14 @@ class KioskEnterpriseTest : public KioskTest { protected: KioskEnterpriseTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { device_policy_test_helper_.MarkAsEnterpriseOwned(); device_policy_test_helper_.InstallOwnerKey(); KioskTest::SetUpInProcessBrowserTestFixture(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { set_test_app_id(kTestEnterpriseKioskApp); set_test_app_version("1.0.0"); set_test_crx_file(test_app_id() + ".crx"); @@ -1708,18 +1708,18 @@ class KioskHiddenWebUITest : public KioskTest, KioskHiddenWebUITest() : wallpaper_loaded_(false) {} // KioskTest overrides: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { KioskTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kDisableBootAnimation); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { KioskTest::SetUpOnMainThread(); ash::Shell::GetInstance()->desktop_background_controller() ->AddObserver(this); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { ash::Shell::GetInstance()->desktop_background_controller() ->RemoveObserver(this); KioskTest::TearDownOnMainThread(); @@ -1735,7 +1735,7 @@ class KioskHiddenWebUITest : public KioskTest, bool wallpaper_loaded() const { return wallpaper_loaded_; } // ash::DesktopBackgroundControllerObserver overrides: - virtual void OnWallpaperDataChanged() OVERRIDE { + virtual void OnWallpaperDataChanged() override { wallpaper_loaded_ = true; if (runner_.get()) runner_->Quit(); diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc index 017e714..abc520c 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker.cc @@ -93,14 +93,14 @@ class ScreenLockObserver : public SessionManagerClient::StubDelegate, bool session_started() const { return session_started_; } // SessionManagerClient::StubDelegate overrides: - virtual void LockScreenForStub() OVERRIDE { + virtual void LockScreenForStub() override { ScreenLocker::HandleLockScreenRequest(); } // NotificationObserver overrides: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { if (type == chrome::NOTIFICATION_SESSION_STARTED) session_started_ = true; else @@ -108,7 +108,7 @@ class ScreenLockObserver : public SessionManagerClient::StubDelegate, } // UserAddingScreen::Observer overrides: - virtual void OnUserAddingFinished() OVERRIDE { + virtual void OnUserAddingFinished() override { UserAddingScreen::Get()->RemoveObserver(this); ScreenLocker::HandleLockScreenRequest(); } diff --git a/chrome/browser/chromeos/login/lock/screen_locker.h b/chrome/browser/chromeos/login/lock/screen_locker.h index e2b87e7..736421f 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker.h +++ b/chrome/browser/chromeos/login/lock/screen_locker.h @@ -61,8 +61,8 @@ class ScreenLocker : public AuthStatusConsumer { void Init(); // AuthStatusConsumer: - virtual void OnAuthFailure(const chromeos::AuthFailure& error) OVERRIDE; - virtual void OnAuthSuccess(const UserContext& user_context) OVERRIDE; + virtual void OnAuthFailure(const chromeos::AuthFailure& error) override; + virtual void OnAuthSuccess(const UserContext& user_context) override; // Does actual unlocking once authentication is successful and all blocking // animations are done. diff --git a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc index 89d3abe..ac69290 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc @@ -58,7 +58,7 @@ class Waiter : public content::NotificationObserver { virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { DCHECK(type == chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED || type == chrome::NOTIFICATION_FULLSCREEN_CHANGED); if (running_) @@ -119,7 +119,7 @@ class ScreenLockerTest : public InProcessBrowserTest { } private: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { fake_session_manager_client_ = new FakeSessionManagerClient; DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); @@ -129,7 +129,7 @@ class ScreenLockerTest : public InProcessBrowserTest { ui::ScopedAnimationDurationScaleMode::ZERO_DURATION)); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); } diff --git a/chrome/browser/chromeos/login/lock/screen_locker_tester.cc b/chrome/browser/chromeos/login/lock/screen_locker_tester.cc index 1354e13..8f3e20f 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker_tester.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker_tester.cc @@ -40,12 +40,12 @@ class LoginAttemptObserver : public chromeos::AuthStatusConsumer { void WaitForAttempt(); // Overridden from AuthStatusConsumer: - virtual void OnAuthFailure(const chromeos::AuthFailure& error) OVERRIDE { + virtual void OnAuthFailure(const chromeos::AuthFailure& error) override { LoginAttempted(); } virtual void OnAuthSuccess( - const chromeos::UserContext& credentials) OVERRIDE { + const chromeos::UserContext& credentials) override { LoginAttempted(); } @@ -94,12 +94,12 @@ namespace test { class WebUIScreenLockerTester : public ScreenLockerTester { public: // ScreenLockerTester overrides: - virtual void SetPassword(const std::string& password) OVERRIDE; - virtual std::string GetPassword() OVERRIDE; - virtual void EnterPassword(const std::string& password) OVERRIDE; - virtual void EmulateWindowManagerReady() OVERRIDE; - virtual views::Widget* GetWidget() const OVERRIDE; - virtual views::Widget* GetChildWidget() const OVERRIDE; + virtual void SetPassword(const std::string& password) override; + virtual std::string GetPassword() override; + virtual void EnterPassword(const std::string& password) override; + virtual void EmulateWindowManagerReady() override; + virtual views::Widget* GetWidget() const override; + virtual views::Widget* GetChildWidget() const override; private: friend class chromeos::ScreenLocker; diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.h b/chrome/browser/chromeos/login/lock/webui_screen_locker.h index c484991..2fcad33 100644 --- a/chrome/browser/chromeos/login/lock/webui_screen_locker.h +++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.h @@ -58,67 +58,67 @@ class WebUIScreenLocker : public WebUILoginView, explicit WebUIScreenLocker(ScreenLocker* screen_locker); // ScreenLockerDelegate implementation. - virtual void LockScreen() OVERRIDE; - virtual void ScreenLockReady() OVERRIDE; - virtual void OnAuthenticate() OVERRIDE; - virtual void SetInputEnabled(bool enabled) OVERRIDE; + virtual void LockScreen() override; + virtual void ScreenLockReady() override; + virtual void OnAuthenticate() override; + virtual void SetInputEnabled(bool enabled) override; virtual void ShowErrorMessage( int error_msg_id, - HelpAppLauncher::HelpTopic help_topic_id) OVERRIDE; - virtual void ClearErrors() OVERRIDE; - virtual void AnimateAuthenticationSuccess() OVERRIDE; - virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; - virtual content::WebUI* GetAssociatedWebUI() OVERRIDE; - virtual void OnLockWebUIReady() OVERRIDE; - virtual void OnLockBackgroundDisplayed() OVERRIDE; + HelpAppLauncher::HelpTopic help_topic_id) override; + virtual void ClearErrors() override; + virtual void AnimateAuthenticationSuccess() override; + virtual gfx::NativeWindow GetNativeWindow() const override; + virtual content::WebUI* GetAssociatedWebUI() override; + virtual void OnLockWebUIReady() override; + virtual void OnLockBackgroundDisplayed() override; // LoginDisplay::Delegate: implementation - virtual void CancelPasswordChangedFlow() OVERRIDE; - virtual void CreateAccount() OVERRIDE; - virtual void CompleteLogin(const UserContext& user_context) OVERRIDE; - virtual base::string16 GetConnectedNetworkName() OVERRIDE; - virtual bool IsSigninInProgress() const OVERRIDE; + virtual void CancelPasswordChangedFlow() override; + virtual void CreateAccount() override; + virtual void CompleteLogin(const UserContext& user_context) override; + virtual base::string16 GetConnectedNetworkName() override; + virtual bool IsSigninInProgress() const override; virtual void Login(const UserContext& user_context, - const SigninSpecifics& specifics) OVERRIDE; - virtual void MigrateUserData(const std::string& old_password) OVERRIDE; - virtual void OnSigninScreenReady() OVERRIDE; - virtual void OnStartEnterpriseEnrollment() OVERRIDE; - virtual void OnStartKioskEnableScreen() OVERRIDE; - virtual void OnStartKioskAutolaunchScreen() OVERRIDE; - virtual void ShowWrongHWIDScreen() OVERRIDE; - virtual void ResetPublicSessionAutoLoginTimer() OVERRIDE; - virtual void ResyncUserData() OVERRIDE; - virtual void SetDisplayEmail(const std::string& email) OVERRIDE; - virtual void Signout() OVERRIDE; + const SigninSpecifics& specifics) override; + virtual void MigrateUserData(const std::string& old_password) override; + virtual void OnSigninScreenReady() override; + virtual void OnStartEnterpriseEnrollment() override; + virtual void OnStartKioskEnableScreen() override; + virtual void OnStartKioskAutolaunchScreen() override; + virtual void ShowWrongHWIDScreen() override; + virtual void ResetPublicSessionAutoLoginTimer() override; + virtual void ResyncUserData() override; + virtual void SetDisplayEmail(const std::string& email) override; + virtual void Signout() override; // content::NotificationObserver (via WebUILoginView) implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // LockWindow::Observer implementation. - virtual void OnLockWindowReady() OVERRIDE; + virtual void OnLockWindowReady() override; // LockStateObserver override. virtual void OnLockStateEvent( - ash::LockStateObserver::EventType event) OVERRIDE; + ash::LockStateObserver::EventType event) override; // WidgetObserver override. - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; // PowerManagerClient::Observer overrides: - virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE; + virtual void SuspendDone(const base::TimeDelta& sleep_duration) override; virtual void LidEventReceived(bool open, - const base::TimeTicks& time) OVERRIDE; + const base::TimeTicks& time) override; // Overridden from content::WebContentsObserver: - virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; + virtual void RenderProcessGone(base::TerminationStatus status) override; // Overridden from ash::KeyboardStateObserver: - virtual void OnVirtualKeyboardStateChanged(bool activated) OVERRIDE; + virtual void OnVirtualKeyboardStateChanged(bool activated) override; // Overridden from keyboard::KeyboardControllerObserver: - virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE; + virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; // Returns instance of the OOBE WebUI. OobeUI* GetOobeUI(); diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc index 5469901..dac8921 100644 --- a/chrome/browser/chromeos/login/login_browsertest.cc +++ b/chrome/browser/chromeos/login/login_browsertest.cc @@ -32,7 +32,7 @@ namespace { class LoginUserTest : public InProcessBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII( chromeos::switches::kLoginUser, "TestUser@gmail.com"); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, @@ -42,7 +42,7 @@ class LoginUserTest : public InProcessBrowserTest { class LoginGuestTest : public InProcessBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kGuestSession); command_line->AppendSwitch(::switches::kIncognito); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, @@ -54,19 +54,19 @@ class LoginGuestTest : public InProcessBrowserTest { class LoginCursorTest : public InProcessBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kLoginManager); } }; class LoginSigninTest : public InProcessBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kLoginManager); command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ASSERT_TRUE(tracing::BeginTracingWithWatch( "ui", "ui", "ShowLoginWebUI", 1)); } diff --git a/chrome/browser/chromeos/login/login_manager_test.h b/chrome/browser/chromeos/login/login_manager_test.h index 30f478e..17108a3 100644 --- a/chrome/browser/chromeos/login/login_manager_test.h +++ b/chrome/browser/chromeos/login/login_manager_test.h @@ -30,10 +30,10 @@ class LoginManagerTest : public MixinBasedBrowserTest { explicit LoginManagerTest(bool should_launch_browser); // Overriden from InProcessBrowserTest. - virtual void TearDownOnMainThread() OVERRIDE; - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() override; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; + virtual void SetUpInProcessBrowserTestFixture() override; + virtual void SetUpOnMainThread() override; // Registers the user with the given |user_id| on the device. // This method should be called in PRE_* test. diff --git a/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc b/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc index d5a4f1f..f155f6c 100644 --- a/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc +++ b/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc @@ -19,11 +19,11 @@ namespace em = enterprise_management; namespace chromeos { class LoginScreenPolicyTest : public policy::DevicePolicyCrosBrowserTest { - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kLoginManager); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { InstallOwnerKey(); MarkAsEnterpriseOwned(); DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture(); diff --git a/chrome/browser/chromeos/login/login_ui_keyboard_browsertest.cc b/chrome/browser/chromeos/login/login_ui_keyboard_browsertest.cc index 0c74408..903c0ca 100644 --- a/chrome/browser/chromeos/login/login_ui_keyboard_browsertest.cc +++ b/chrome/browser/chromeos/login/login_ui_keyboard_browsertest.cc @@ -88,7 +88,7 @@ class LoginUIKeyboardTest : public chromeos::LoginManagerTest { LoginUIKeyboardTest() : LoginManagerTest(false) {} virtual ~LoginUIKeyboardTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { user_input_methods.push_back("xkb:fr::fra"); user_input_methods.push_back("xkb:de::ger"); @@ -178,14 +178,14 @@ class LoginUIKeyboardTestWithUsersAndOwner : public chromeos::LoginManagerTest { LoginUIKeyboardTestWithUsersAndOwner() : LoginManagerTest(false) {} virtual ~LoginUIKeyboardTestWithUsersAndOwner() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { LoginManagerTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kStubCrosSettings); LoginManagerTest::SetUpCommandLine(command_line); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { user_input_methods.push_back("xkb:fr::fra"); user_input_methods.push_back("xkb:de::ger"); user_input_methods.push_back("xkb:pl::pol"); diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 5a9f626..9d8adb3 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -186,25 +186,25 @@ class LoginUtilsImpl : public LoginUtils, // LoginUtils implementation: virtual void RespectLocalePreference(Profile* profile, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; virtual void DoBrowserLaunch(Profile* profile, - LoginDisplayHost* login_host) OVERRIDE; + LoginDisplayHost* login_host) override; virtual void PrepareProfile( const UserContext& user_context, bool has_auth_cookies, bool has_active_session, - LoginUtils::Delegate* delegate) OVERRIDE; - virtual void DelegateDeleted(LoginUtils::Delegate* delegate) OVERRIDE; - virtual void CompleteOffTheRecordLogin(const GURL& start_url) OVERRIDE; + LoginUtils::Delegate* delegate) override; + virtual void DelegateDeleted(LoginUtils::Delegate* delegate) override; + virtual void CompleteOffTheRecordLogin(const GURL& start_url) override; virtual scoped_refptr<Authenticator> CreateAuthenticator( - AuthStatusConsumer* consumer) OVERRIDE; + AuthStatusConsumer* consumer) override; virtual bool RestartToApplyPerSessionFlagsIfNeed(Profile* profile, - bool early_restart) OVERRIDE; + bool early_restart) override; // UserSessionManager::Delegate implementation: - virtual void OnProfilePrepared(Profile* profile) OVERRIDE; + virtual void OnProfilePrepared(Profile* profile) override; #if defined(ENABLE_RLZ) - virtual void OnRlzInitialized() OVERRIDE; + virtual void OnRlzInitialized() override; #endif private: diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc index 30c3cc9..077e87e 100644 --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc @@ -46,7 +46,7 @@ class LoginUtilsTest : public InProcessBrowserTest { public: LoginUtilsTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Initialize the test server early, so that we can use its base url for // the command line flags. ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); @@ -65,13 +65,13 @@ class LoginUtilsTest : public InProcessBrowserTest { embedded_test_server()->base_url().spec()); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { fake_gaia_.Initialize(); embedded_test_server()->RegisterRequestHandler( base::Bind(&FakeGaia::HandleRequest, base::Unretained(&fake_gaia_))); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { RunUntilIdle(); EXPECT_TRUE(embedded_test_server()->ShutdownAndWaitUntilComplete()); } diff --git a/chrome/browser/chromeos/login/mixin_based_browser_test.h b/chrome/browser/chromeos/login/mixin_based_browser_test.h index af367f2..a5a5f71 100644 --- a/chrome/browser/chromeos/login/mixin_based_browser_test.h +++ b/chrome/browser/chromeos/login/mixin_based_browser_test.h @@ -58,11 +58,11 @@ class MixinBasedBrowserTest : public InProcessBrowserTest { virtual ~MixinBasedBrowserTest(); // Override from InProcessBrowserTest. - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; - virtual void TearDownOnMainThread() OVERRIDE; - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; + virtual void SetUpInProcessBrowserTestFixture() override; + virtual void SetUpOnMainThread() override; + virtual void TearDownOnMainThread() override; + virtual void TearDownInProcessBrowserTestFixture() override; protected: // Adds |mixin| as an mixin for this test, passing ownership diff --git a/chrome/browser/chromeos/login/oobe_browsertest.cc b/chrome/browser/chromeos/login/oobe_browsertest.cc index 53b218a..51a33ec 100644 --- a/chrome/browser/chromeos/login/oobe_browsertest.cc +++ b/chrome/browser/chromeos/login/oobe_browsertest.cc @@ -32,7 +32,7 @@ class OobeTest : public InProcessBrowserTest { OobeTest() {} virtual ~OobeTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kLoginManager); command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); @@ -41,7 +41,7 @@ class OobeTest : public InProcessBrowserTest { fake_gaia_.Initialize(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { CHECK(embedded_test_server()->InitializeAndWaitUntilReady()); embedded_test_server()->RegisterRequestHandler( base::Bind(&FakeGaia::HandleRequest, base::Unretained(&fake_gaia_))); @@ -51,7 +51,7 @@ class OobeTest : public InProcessBrowserTest { ::switches::kGaiaUrl, embedded_test_server()->base_url().spec()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { // If the login display is still showing, exit gracefully. if (LoginDisplayHostImpl::default_host()) { base::MessageLoop::current()->PostTask(FROM_HERE, diff --git a/chrome/browser/chromeos/login/oobe_localization_browsertest.cc b/chrome/browser/chromeos/login/oobe_localization_browsertest.cc index f680218..cb68d69 100644 --- a/chrome/browser/chromeos/login/oobe_localization_browsertest.cc +++ b/chrome/browser/chromeos/login/oobe_localization_browsertest.cc @@ -59,13 +59,13 @@ class FakeStatisticsProvider : public StatisticsProvider { // StatisticsProvider overrides. virtual void StartLoadingMachineStatistics( const scoped_refptr<base::TaskRunner>& file_task_runner, - bool load_oem_manifest) OVERRIDE { + bool load_oem_manifest) override { } // Populates the named machine statistic for initial_locale and // keyboard_layout only. virtual bool GetMachineStatistic(const std::string& name, - std::string* result) OVERRIDE { + std::string* result) override { if (name == "initial_locale") *result = initial_locale_; else if (name == "keyboard_layout") @@ -76,11 +76,11 @@ class FakeStatisticsProvider : public StatisticsProvider { return true; } - virtual bool GetMachineFlag(const std::string& name, bool* result) OVERRIDE { + virtual bool GetMachineFlag(const std::string& name, bool* result) override { return false; } - virtual void Shutdown() OVERRIDE { + virtual void Shutdown() override { } std::string initial_locale_; diff --git a/chrome/browser/chromeos/login/profile_auth_data_unittest.cc b/chrome/browser/chromeos/login/profile_auth_data_unittest.cc index 1726bb9..5482aa0 100644 --- a/chrome/browser/chromeos/login/profile_auth_data_unittest.cc +++ b/chrome/browser/chromeos/login/profile_auth_data_unittest.cc @@ -61,7 +61,7 @@ const char kChannelIDCert2[] = "cert 2"; class ProfileAuthDataTest : public testing::Test { public: // testing::Test: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; void PopulateUserBrowserContext(); diff --git a/chrome/browser/chromeos/login/reset_browsertest.cc b/chrome/browser/chromeos/login/reset_browsertest.cc index f9c2577..0cd28cd 100644 --- a/chrome/browser/chromeos/login/reset_browsertest.cc +++ b/chrome/browser/chromeos/login/reset_browsertest.cc @@ -38,13 +38,13 @@ class ResetTest : public LoginManagerTest { } virtual ~ResetTest() {} - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { LoginManagerTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnableRollbackOption); } // LoginManagerTest overrides: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { scoped_ptr<DBusThreadManagerSetter> dbus_setter = chromeos::DBusThreadManager::GetSetterForTesting(); session_manager_client_ = new FakeSessionManagerClient; @@ -103,7 +103,7 @@ class ResetFirstAfterBootTest : public ResetTest { public: virtual ~ResetFirstAfterBootTest() {} - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { LoginManagerTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kFirstExecAfterBoot); command_line->AppendSwitch(switches::kEnableRollbackOption); diff --git a/chrome/browser/chromeos/login/resource_loader_browsertest.cc b/chrome/browser/chromeos/login/resource_loader_browsertest.cc index 2446bc0..f667db6 100644 --- a/chrome/browser/chromeos/login/resource_loader_browsertest.cc +++ b/chrome/browser/chromeos/login/resource_loader_browsertest.cc @@ -33,12 +33,12 @@ class ResourceLoaderBrowserTest : public InProcessBrowserTest { ResourceLoaderBrowserTest() {} protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Needed to load file:// URLs in XHRs. command_line->AppendSwitch(switches::kDisableWebSecurity); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { // Create the root page containing resource_loader.js. std::string root_page = "<html>" diff --git a/chrome/browser/chromeos/login/saml/saml_browsertest.cc b/chrome/browser/chromeos/login/saml/saml_browsertest.cc index f3563ed..96bc899 100644 --- a/chrome/browser/chromeos/login/saml/saml_browsertest.cc +++ b/chrome/browser/chromeos/login/saml/saml_browsertest.cc @@ -245,7 +245,7 @@ class SamlTest : public InProcessBrowserTest { SamlTest() : saml_load_injected_(false) {} virtual ~SamlTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); // Start the GAIA https wrapper here so that the GAIA URLs can be pointed at @@ -267,11 +267,11 @@ class SamlTest : public InProcessBrowserTest { InProcessBrowserTest::SetUp(); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { host_resolver()->AddRule("*", "127.0.0.1"); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kLoginManager); command_line->AppendSwitch(switches::kForceLoginManagerInTests); command_line->AppendSwitch(::switches::kDisableBackgroundNetworking); @@ -295,7 +295,7 @@ class SamlTest : public InProcessBrowserTest { fake_gaia_.Initialize(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { fake_gaia_.SetFakeMergeSessionParams(kFirstSAMLUserEmail, kTestAuthSIDCookie1, kTestAuthLSIDCookie1); @@ -313,7 +313,7 @@ class SamlTest : public InProcessBrowserTest { content::NotificationService::AllSources())); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { // If the login display is still showing, exit gracefully. if (LoginDisplayHostImpl::default_host()) { base::MessageLoop::current()->PostTask(FROM_HERE, @@ -645,8 +645,8 @@ class SAMLPolicyTest : public SamlTest { virtual ~SAMLPolicyTest(); // SamlTest: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpInProcessBrowserTestFixture() override; + virtual void SetUpOnMainThread() override; void SetSAMLOfflineSigninTimeLimitPolicy(int limit); void EnableTransferSAMLCookiesPolicy(); diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h index c21cead..06df112 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h @@ -39,7 +39,7 @@ class SAMLOfflineSigninLimiter : public KeyedService { void SignedIn(UserContext::AuthFlow auth_flow); // KeyedService: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; private: friend class SAMLOfflineSigninLimiterFactory; diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h index 298ffc4..21091b5 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h @@ -41,7 +41,7 @@ class SAMLOfflineSigninLimiterFactory // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; static base::Clock* clock_for_testing_; diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc index 0828fdc..fa2e725 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc @@ -36,8 +36,8 @@ class SAMLOfflineSigninLimiterTest : public testing::Test { virtual ~SAMLOfflineSigninLimiterTest(); // testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; void DestroyLimiter(); void CreateLimiter(); diff --git a/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h b/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h index db17645..391ed1f 100644 --- a/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h +++ b/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h @@ -26,12 +26,12 @@ class ChromeUserSelectionScreen // UserSelectionScreen: virtual void Init(const user_manager::UserList& users, - bool show_guest) OVERRIDE; - virtual void SendUserList() OVERRIDE; + bool show_guest) override; + virtual void SendUserList() override; // policy::DeviceLocalAccountPolicyService::Observer: - virtual void OnPolicyUpdated(const std::string& user_id) OVERRIDE; - virtual void OnDeviceLocalAccountsChanged() OVERRIDE; + virtual void OnPolicyUpdated(const std::string& user_id) override; + virtual void OnDeviceLocalAccountsChanged() override; private: // Check whether the display name set by policy for a public session has diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen.h b/chrome/browser/chromeos/login/screens/controller_pairing_screen.h index cd66be6..0891653 100644 --- a/chrome/browser/chromeos/login/screens/controller_pairing_screen.h +++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen.h @@ -32,20 +32,20 @@ class ControllerPairingScreen : bool ExpectStageIs(Stage stage) const; // Overridden from WizardScreen: - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // Overridden from pairing_chromeos::ControllerPairingController::Observer: - virtual void PairingStageChanged(Stage new_stage) OVERRIDE; - virtual void DiscoveredDevicesListChanged() OVERRIDE; + virtual void PairingStageChanged(Stage new_stage) override; + virtual void DiscoveredDevicesListChanged() override; // Overridden from ControllerPairingView::Delegate: - virtual void OnActorDestroyed(ControllerPairingScreenActor* actor) OVERRIDE; + virtual void OnActorDestroyed(ControllerPairingScreenActor* actor) override; virtual void OnScreenContextChanged( - const base::DictionaryValue& diff) OVERRIDE; - virtual void OnUserActed(const std::string& action) OVERRIDE; + const base::DictionaryValue& diff) override; + virtual void OnUserActed(const std::string& action) override; // Context for sharing data between C++ and JS. // TODO(dzhioev): move to BaseScreen when possible. diff --git a/chrome/browser/chromeos/login/screens/error_screen.h b/chrome/browser/chromeos/login/screens/error_screen.h index ecc7531..dcbad25 100644 --- a/chrome/browser/chromeos/login/screens/error_screen.h +++ b/chrome/browser/chromeos/login/screens/error_screen.h @@ -48,25 +48,25 @@ class ErrorScreen : public WizardScreen, virtual ~ErrorScreen(); // WizardScreen implementation. - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // ErrorScreenActorDelegate implementation: - virtual void OnErrorShow() OVERRIDE; - virtual void OnErrorHide() OVERRIDE; - virtual void OnLaunchOobeGuestSession() OVERRIDE; + virtual void OnErrorShow() override; + virtual void OnErrorHide() override; + virtual void OnLaunchOobeGuestSession() override; // LoginPerformer::Delegate implementation: - virtual void OnAuthFailure(const AuthFailure& error) OVERRIDE; - virtual void OnAuthSuccess(const UserContext& user_context) OVERRIDE; - virtual void OnOffTheRecordAuthSuccess() OVERRIDE; - virtual void OnPasswordChangeDetected() OVERRIDE; - virtual void WhiteListCheckFailed(const std::string& email) OVERRIDE; - virtual void PolicyLoadFailed() OVERRIDE; + virtual void OnAuthFailure(const AuthFailure& error) override; + virtual void OnAuthSuccess(const UserContext& user_context) override; + virtual void OnOffTheRecordAuthSuccess() override; + virtual void OnPasswordChangeDetected() override; + virtual void WhiteListCheckFailed(const std::string& email) override; + virtual void PolicyLoadFailed() override; virtual void OnOnlineChecked(const std::string& username, - bool success) OVERRIDE; + bool success) override; // Initializes captive portal dialog and shows that if needed. void FixCaptivePortal(); diff --git a/chrome/browser/chromeos/login/screens/eula_screen.h b/chrome/browser/chromeos/login/screens/eula_screen.h index 8c71851..69e215f 100644 --- a/chrome/browser/chromeos/login/screens/eula_screen.h +++ b/chrome/browser/chromeos/login/screens/eula_screen.h @@ -25,20 +25,20 @@ class EulaScreen : public WizardScreen, virtual ~EulaScreen(); // WizardScreen implementation: - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // EulaScreenActor::Delegate implementation: - virtual GURL GetOemEulaUrl() const OVERRIDE; - virtual void OnExit(bool accepted, bool usage_stats_enabled) OVERRIDE; - virtual void InitiatePasswordFetch() OVERRIDE; - virtual bool IsUsageStatsEnabled() const OVERRIDE; - virtual void OnActorDestroyed(EulaScreenActor* actor) OVERRIDE; + virtual GURL GetOemEulaUrl() const override; + virtual void OnExit(bool accepted, bool usage_stats_enabled) override; + virtual void InitiatePasswordFetch() override; + virtual bool IsUsageStatsEnabled() const override; + virtual void OnActorDestroyed(EulaScreenActor* actor) override; // TpmPasswordFetcherDelegate implementation: - virtual void OnPasswordFetched(const std::string& tpm_password) OVERRIDE; + virtual void OnPasswordFetched(const std::string& tpm_password) override; private: // URL of the OEM EULA page (on disk). diff --git a/chrome/browser/chromeos/login/screens/hid_detection_screen.h b/chrome/browser/chromeos/login/screens/hid_detection_screen.h index b534086..2764342 100644 --- a/chrome/browser/chromeos/login/screens/hid_detection_screen.h +++ b/chrome/browser/chromeos/login/screens/hid_detection_screen.h @@ -23,14 +23,14 @@ class HIDDetectionScreen : public WizardScreen, virtual ~HIDDetectionScreen(); // WizardScreen implementation: - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // HIDDetectionScreenActor::Delegate implementation: - virtual void OnExit() OVERRIDE; - virtual void OnActorDestroyed(HIDDetectionScreenActor* actor) OVERRIDE; + virtual void OnExit() override; + virtual void OnActorDestroyed(HIDDetectionScreenActor* actor) override; private: HIDDetectionScreenActor* actor_; diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen.h b/chrome/browser/chromeos/login/screens/host_pairing_screen.h index c69f5f8..03b7b2c 100644 --- a/chrome/browser/chromeos/login/screens/host_pairing_screen.h +++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.h @@ -28,22 +28,22 @@ class HostPairingScreen : void CommitContextChanges(); // Overridden from WizardScreen: - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // pairing_chromeos::HostPairingController::Observer: - virtual void PairingStageChanged(Stage new_stage) OVERRIDE; + virtual void PairingStageChanged(Stage new_stage) override; virtual void ConfigureHost(bool accepted_eula, const std::string& lang, const std::string& timezone, bool send_reports, - const std::string& keyboard_layout) OVERRIDE; - virtual void EnrollHost(const std::string& auth_token) OVERRIDE; + const std::string& keyboard_layout) override; + virtual void EnrollHost(const std::string& auth_token) override; // Overridden from ControllerPairingView::Delegate: - virtual void OnActorDestroyed(HostPairingScreenActor* actor) OVERRIDE; + virtual void OnActorDestroyed(HostPairingScreenActor* actor) override; // Context for sharing data between C++ and JS. // TODO(dzhioev): move to BaseScreen when possible. diff --git a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h index 14244e2..cb18f93 100644 --- a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h +++ b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h @@ -24,14 +24,14 @@ class KioskAutolaunchScreen : public WizardScreen, virtual ~KioskAutolaunchScreen(); // WizardScreen implementation: - virtual void PrepareToShow() OVERRIDE {} - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE {} - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override {} + virtual void Show() override; + virtual void Hide() override {} + virtual std::string GetName() const override; // KioskAutolaunchScreenActor::Delegate implementation: - virtual void OnExit(bool confirmed) OVERRIDE; - virtual void OnActorDestroyed(KioskAutolaunchScreenActor* actor) OVERRIDE; + virtual void OnExit(bool confirmed) override; + virtual void OnActorDestroyed(KioskAutolaunchScreenActor* actor) override; private: KioskAutolaunchScreenActor* actor_; diff --git a/chrome/browser/chromeos/login/screens/kiosk_enable_screen.h b/chrome/browser/chromeos/login/screens/kiosk_enable_screen.h index 86c46f1..ca9cb5a 100644 --- a/chrome/browser/chromeos/login/screens/kiosk_enable_screen.h +++ b/chrome/browser/chromeos/login/screens/kiosk_enable_screen.h @@ -23,14 +23,14 @@ class KioskEnableScreen : public WizardScreen, virtual ~KioskEnableScreen(); // WizardScreen implementation: - virtual void PrepareToShow() OVERRIDE {} - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE {} - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override {} + virtual void Show() override; + virtual void Hide() override {} + virtual std::string GetName() const override; // KioskEnableScreenActor::Delegate implementation: - virtual void OnExit() OVERRIDE; - virtual void OnActorDestroyed(KioskEnableScreenActor* actor) OVERRIDE; + virtual void OnExit() override; + virtual void OnActorDestroyed(KioskEnableScreenActor* actor) override; private: KioskEnableScreenActor* actor_; diff --git a/chrome/browser/chromeos/login/screens/mock_update_screen.h b/chrome/browser/chromeos/login/screens/mock_update_screen.h index 097efc0..ab5d3b2c 100644 --- a/chrome/browser/chromeos/login/screens/mock_update_screen.h +++ b/chrome/browser/chromeos/login/screens/mock_update_screen.h @@ -25,7 +25,7 @@ class MockUpdateScreenActor : public UpdateScreenActor { MockUpdateScreenActor(); virtual ~MockUpdateScreenActor(); - virtual void SetDelegate(UpdateScreenActor::Delegate* screen) OVERRIDE; + virtual void SetDelegate(UpdateScreenActor::Delegate* screen) override; MOCK_METHOD1(MockSetDelegate, void(UpdateScreenActor::Delegate* screen)); MOCK_METHOD0(Show, void()); diff --git a/chrome/browser/chromeos/login/screens/network_screen.h b/chrome/browser/chromeos/login/screens/network_screen.h index 1124bb1..e0e17d9 100644 --- a/chrome/browser/chromeos/login/screens/network_screen.h +++ b/chrome/browser/chromeos/login/screens/network_screen.h @@ -31,19 +31,19 @@ class NetworkScreen : public WizardScreen, static NetworkScreen* Get(ScreenManager* manager); // WizardScreen implementation: - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // NetworkStateHandlerObserver implementation: virtual void NetworkConnectionStateChanged( - const NetworkState* network) OVERRIDE; - virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE; + const NetworkState* network) override; + virtual void DefaultNetworkChanged(const NetworkState* network) override; // NetworkScreenActor::Delegate implementation: - virtual void OnActorDestroyed(NetworkScreenActor* actor) OVERRIDE; - virtual void OnContinuePressed() OVERRIDE; + virtual void OnActorDestroyed(NetworkScreenActor* actor) override; + virtual void OnContinuePressed() override; NetworkScreenActor* actor() const { return actor_; } diff --git a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc index e58283c..8276ccf 100644 --- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc @@ -29,7 +29,7 @@ namespace chromeos { class DummyButtonListener : public views::ButtonListener { public: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE {} + const ui::Event& event) override {} }; namespace login { @@ -50,7 +50,7 @@ class NetworkScreenTest : public WizardInProcessBrowserTest { } protected: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); fake_session_manager_client_ = new FakeSessionManagerClient; @@ -58,7 +58,7 @@ class NetworkScreenTest : public WizardInProcessBrowserTest { scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { WizardInProcessBrowserTest::SetUpOnMainThread(); mock_screen_observer_.reset(new MockScreenObserver()); ASSERT_TRUE(WizardController::default_controller() != NULL); @@ -75,7 +75,7 @@ class NetworkScreenTest : public WizardInProcessBrowserTest { network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_); } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { InProcessBrowserTest::TearDownInProcessBrowserTestFixture(); } diff --git a/chrome/browser/chromeos/login/screens/reset_screen.h b/chrome/browser/chromeos/login/screens/reset_screen.h index 3a084a3..1dafce1c 100644 --- a/chrome/browser/chromeos/login/screens/reset_screen.h +++ b/chrome/browser/chromeos/login/screens/reset_screen.h @@ -22,14 +22,14 @@ class ResetScreen : public WizardScreen, virtual ~ResetScreen(); // WizardScreen implementation: - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // ResetScreenActor::Delegate implementation: - virtual void OnExit() OVERRIDE; - virtual void OnActorDestroyed(ResetScreenActor* actor) OVERRIDE; + virtual void OnExit() override; + virtual void OnActorDestroyed(ResetScreenActor* actor) override; private: ResetScreenActor* actor_; diff --git a/chrome/browser/chromeos/login/screens/terms_of_service_screen.h b/chrome/browser/chromeos/login/screens/terms_of_service_screen.h index 1b79569..344507a 100644 --- a/chrome/browser/chromeos/login/screens/terms_of_service_screen.h +++ b/chrome/browser/chromeos/login/screens/terms_of_service_screen.h @@ -34,15 +34,15 @@ class TermsOfServiceScreen : public WizardScreen, virtual ~TermsOfServiceScreen(); // WizardScreen: - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // TermsOfServiceScreenActor::Delegate: - virtual void OnDecline() OVERRIDE; - virtual void OnAccept() OVERRIDE; - virtual void OnActorDestroyed(TermsOfServiceScreenActor* actor) OVERRIDE; + virtual void OnDecline() override; + virtual void OnAccept() override; + virtual void OnActorDestroyed(TermsOfServiceScreenActor* actor) override; private: // Start downloading the Terms of Service. @@ -52,7 +52,7 @@ class TermsOfServiceScreen : public WizardScreen, void OnDownloadTimeout(); // net::URLFetcherDelegate: - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; TermsOfServiceScreenActor* actor_; diff --git a/chrome/browser/chromeos/login/screens/update_screen.h b/chrome/browser/chromeos/login/screens/update_screen.h index f828ca0..024a70d 100644 --- a/chrome/browser/chromeos/login/screens/update_screen.h +++ b/chrome/browser/chromeos/login/screens/update_screen.h @@ -39,15 +39,15 @@ class UpdateScreen: public UpdateEngineClient::Observer, static UpdateScreen* Get(ScreenManager* manager); // Overridden from WizardScreen. - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // UpdateScreenActor::Delegate implementation: - virtual void CancelUpdate() OVERRIDE; - virtual void OnActorDestroyed(UpdateScreenActor* actor) OVERRIDE; - virtual void OnConnectToNetworkRequested() OVERRIDE; + virtual void CancelUpdate() override; + virtual void OnActorDestroyed(UpdateScreenActor* actor) override; + virtual void OnConnectToNetworkRequested() override; // Starts network check. Made virtual to simplify mocking. virtual void StartNetworkCheck(); @@ -72,12 +72,12 @@ class UpdateScreen: public UpdateEngineClient::Observer, // UpdateEngineClient::Observer implementation: virtual void UpdateStatusChanged( - const UpdateEngineClient::Status& status) OVERRIDE; + const UpdateEngineClient::Status& status) override; // NetworkPortalDetector::Observer implementation: virtual void OnPortalDetectionCompleted( const NetworkState* network, - const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE; + const NetworkPortalDetector::CaptivePortalState& state) override; private: FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestBasic); diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc index b881a96..8a93818 100644 --- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc @@ -45,7 +45,7 @@ class UpdateScreenTest : public WizardInProcessBrowserTest { } protected: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { fake_update_engine_client_ = new FakeUpdateEngineClient; chromeos::DBusThreadManager::GetSetterForTesting()->SetUpdateEngineClient( scoped_ptr<UpdateEngineClient>(fake_update_engine_client_)); @@ -65,7 +65,7 @@ class UpdateScreenTest : public WizardInProcessBrowserTest { SetDetectionResults(kStubWifiGuid, online_state); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { WizardInProcessBrowserTest::SetUpOnMainThread(); mock_screen_observer_.reset(new MockScreenObserver()); @@ -87,13 +87,13 @@ class UpdateScreenTest : public WizardInProcessBrowserTest { update_screen_->screen_observer_ = mock_screen_observer_.get(); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { mock_error_screen_.reset(); mock_error_screen_actor_.reset(); WizardInProcessBrowserTest::TearDownOnMainThread(); } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { NetworkPortalDetector::Shutdown(); WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture(); } diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.h b/chrome/browser/chromeos/login/screens/user_image_screen.h index 47e4add..ee3cd29 100644 --- a/chrome/browser/chromeos/login/screens/user_image_screen.h +++ b/chrome/browser/chromeos/login/screens/user_image_screen.h @@ -44,39 +44,39 @@ class UserImageScreen: public WizardScreen, static UserImageScreen* Get(ScreenManager* manager); // WizardScreen implementation: - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // UserImageScreenActor::Delegate implementation: - virtual void OnScreenReady() OVERRIDE; - virtual void OnPhotoTaken(const std::string& raw_data) OVERRIDE; + virtual void OnScreenReady() override; + virtual void OnPhotoTaken(const std::string& raw_data) override; virtual void OnImageSelected(const std::string& image_url, const std::string& image_type, - bool is_user_selection) OVERRIDE; - virtual void OnImageAccepted() OVERRIDE; - virtual void OnActorDestroyed(UserImageScreenActor* actor) OVERRIDE; + bool is_user_selection) override; + virtual void OnImageAccepted() override; + virtual void OnActorDestroyed(UserImageScreenActor* actor) override; - virtual bool profile_picture_absent() OVERRIDE; - virtual int selected_image() OVERRIDE; - virtual std::string profile_picture_data_url() OVERRIDE; + virtual bool profile_picture_absent() override; + virtual int selected_image() override; + virtual std::string profile_picture_data_url() override; // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // ImageDecoder::Delegate implementation: virtual void OnImageDecoded(const ImageDecoder* decoder, - const SkBitmap& decoded_image) OVERRIDE; - virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE; + const SkBitmap& decoded_image) override; + virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override; // CameraPresenceNotifier::Observer implementation: - virtual void OnCameraPresenceCheckDone(bool is_camera_present) OVERRIDE; + virtual void OnCameraPresenceCheckDone(bool is_camera_present) override; // UserImageSyncObserver::Observer implementation: - virtual void OnInitialSync(bool local_image_updated) OVERRIDE; + virtual void OnInitialSync(bool local_image_updated) override; bool user_selected_image() const { return user_has_selected_image_; } diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.h b/chrome/browser/chromeos/login/screens/user_selection_screen.h index 6302e2d..1663f1e 100644 --- a/chrome/browser/chromeos/login/screens/user_selection_screen.h +++ b/chrome/browser/chromeos/login/screens/user_selection_screen.h @@ -48,7 +48,7 @@ class UserSelectionScreen : public wm::UserActivityObserver { const std::string& username) const; // wm::UserActivityDetector implementation: - virtual void OnUserActivity(const ui::Event* event) OVERRIDE; + virtual void OnUserActivity(const ui::Event* event) override; // Fills |user_dict| with information about |user|. static void FillUserDictionary( diff --git a/chrome/browser/chromeos/login/screens/wrong_hwid_screen.h b/chrome/browser/chromeos/login/screens/wrong_hwid_screen.h index 9bea5b7..9c828d8 100644 --- a/chrome/browser/chromeos/login/screens/wrong_hwid_screen.h +++ b/chrome/browser/chromeos/login/screens/wrong_hwid_screen.h @@ -23,14 +23,14 @@ class WrongHWIDScreen : public WizardScreen, virtual ~WrongHWIDScreen(); // WizardScreen implementation: - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // WrongHWIDScreenActor::Delegate implementation: - virtual void OnExit() OVERRIDE; - virtual void OnActorDestroyed(WrongHWIDScreenActor* actor) OVERRIDE; + virtual void OnExit() override; + virtual void OnActorDestroyed(WrongHWIDScreenActor* actor) override; private: WrongHWIDScreenActor* actor_; diff --git a/chrome/browser/chromeos/login/screenshot_testing_mixin.h b/chrome/browser/chromeos/login/screenshot_testing_mixin.h index 852d8d7..f0721eb 100644 --- a/chrome/browser/chromeos/login/screenshot_testing_mixin.h +++ b/chrome/browser/chromeos/login/screenshot_testing_mixin.h @@ -25,10 +25,10 @@ class ScreenshotTestingMixin : public MixinBasedBrowserTest::Mixin { virtual ~ScreenshotTestingMixin(); // Override from BrowsertestBase::Mixin. - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; + virtual void SetUpInProcessBrowserTestFixture() override; // Override from BrowsertestBase::Mixin. - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; // Runs screenshot testing if it is turned on by command line switches. void RunScreenshotTesting(const std::string& test_name); diff --git a/chrome/browser/chromeos/login/session/kiosk_auto_launcher_session_manager_delegate.h b/chrome/browser/chromeos/login/session/kiosk_auto_launcher_session_manager_delegate.h index df6bfec..9544914 100644 --- a/chrome/browser/chromeos/login/session/kiosk_auto_launcher_session_manager_delegate.h +++ b/chrome/browser/chromeos/login/session/kiosk_auto_launcher_session_manager_delegate.h @@ -19,7 +19,7 @@ class KioskAutoLauncherSessionManagerDelegate private: // session_manager::SessionManagerDelegate implementation: - virtual void Start() OVERRIDE; + virtual void Start() override; DISALLOW_COPY_AND_ASSIGN(KioskAutoLauncherSessionManagerDelegate); }; diff --git a/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.h b/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.h index 20d6058..469a342 100644 --- a/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.h +++ b/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.h @@ -19,7 +19,7 @@ class LoginOobeSessionManagerDelegate private: // session_manager::SessionManagerDelegate implementation: - virtual void Start() OVERRIDE; + virtual void Start() override; DISALLOW_COPY_AND_ASSIGN(LoginOobeSessionManagerDelegate); }; diff --git a/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.h b/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.h index 397840f..7a75761 100644 --- a/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.h +++ b/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.h @@ -24,7 +24,7 @@ class RestoreAfterCrashSessionManagerDelegate protected: // session_manager::SessionManagerDelegate implementation: - virtual void Start() OVERRIDE; + virtual void Start() override; Profile* profile() { return profile_; } const std::string& login_user_id() const { return login_user_id_; } diff --git a/chrome/browser/chromeos/login/session/stub_login_session_manager_delegate.h b/chrome/browser/chromeos/login/session/stub_login_session_manager_delegate.h index 080d032..2b5f974 100644 --- a/chrome/browser/chromeos/login/session/stub_login_session_manager_delegate.h +++ b/chrome/browser/chromeos/login/session/stub_login_session_manager_delegate.h @@ -24,7 +24,7 @@ class StubLoginSessionManagerDelegate private: // session_manager::SessionManagerDelegate implementation: - virtual void Start() OVERRIDE; + virtual void Start() override; Profile* profile_; diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h index 8a27904..260b302 100644 --- a/chrome/browser/chromeos/login/session/user_session_manager.h +++ b/chrome/browser/chromeos/login/session/user_session_manager.h @@ -160,7 +160,7 @@ class UserSessionManager void RemoveSessionStateObserver(chromeos::UserSessionStateObserver* observer); virtual void ActiveUserChanged( - const user_manager::User* active_user) OVERRIDE; + const user_manager::User* active_user) override; // Returns default IME state for user session. scoped_refptr<input_method::InputMethodManager::State> GetDefaultIMEState( @@ -180,16 +180,16 @@ class UserSessionManager // OAuth2LoginManager::Observer overrides: virtual void OnSessionRestoreStateChanged( Profile* user_profile, - OAuth2LoginManager::SessionRestoreState state) OVERRIDE; - virtual void OnNewRefreshTokenAvaiable(Profile* user_profile) OVERRIDE; + OAuth2LoginManager::SessionRestoreState state) override; + virtual void OnNewRefreshTokenAvaiable(Profile* user_profile) override; // net::NetworkChangeNotifier::ConnectionTypeObserver overrides: virtual void OnConnectionTypeChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; // UserSessionManagerDelegate overrides: // Used when restoring user sessions after crash. - virtual void OnProfilePrepared(Profile* profile) OVERRIDE; + virtual void OnProfilePrepared(Profile* profile) override; void CreateUserSession(const UserContext& user_context, bool has_auth_cookies); diff --git a/chrome/browser/chromeos/login/session_login_browsertest.cc b/chrome/browser/chromeos/login/session_login_browsertest.cc index 2fb4d40..aa7352d 100644 --- a/chrome/browser/chromeos/login/session_login_browsertest.cc +++ b/chrome/browser/chromeos/login/session_login_browsertest.cc @@ -30,7 +30,7 @@ class BrowserLoginTest : public chromeos::LoginManagerTest { BrowserLoginTest() : LoginManagerTest(true) {} virtual ~BrowserLoginTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { LoginManagerTest::SetUpCommandLine(command_line); command_line->AppendSwitch(::switches::kCreateBrowserOnStartupForTests); } diff --git a/chrome/browser/chromeos/login/signin/auth_sync_observer.h b/chrome/browser/chromeos/login/signin/auth_sync_observer.h index 195a4fb..b8e2f3e 100644 --- a/chrome/browser/chromeos/login/signin/auth_sync_observer.h +++ b/chrome/browser/chromeos/login/signin/auth_sync_observer.h @@ -30,10 +30,10 @@ class AuthSyncObserver : public KeyedService, friend class AuthSyncObserverFactory; // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // ProfileSyncServiceObserver implementation. - virtual void OnStateChanged() OVERRIDE; + virtual void OnStateChanged() override; // Called on attempt to restore supervised user token. void OnSupervisedTokenLoaded(const std::string& token); diff --git a/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h b/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h index 71cdd76..3be5113 100644 --- a/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h +++ b/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h @@ -35,7 +35,7 @@ class AuthSyncObserverFactory // BrowserContextKeyedServiceFactory implementation. virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; DISALLOW_COPY_AND_ASSIGN(AuthSyncObserverFactory); }; diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page.h b/chrome/browser/chromeos/login/signin/merge_session_load_page.h index b07390e..d622099 100644 --- a/chrome/browser/chromeos/login/signin/merge_session_load_page.h +++ b/chrome/browser/chromeos/login/signin/merge_session_load_page.h @@ -53,17 +53,17 @@ class MergeSessionLoadPage friend class TestMergeSessionLoadPage; // InterstitialPageDelegate implementation. - virtual std::string GetHTMLContents() OVERRIDE; - virtual void CommandReceived(const std::string& command) OVERRIDE; + virtual std::string GetHTMLContents() override; + virtual void CommandReceived(const std::string& command) override; virtual void OverrideRendererPrefs( - content::RendererPreferences* prefs) OVERRIDE; - virtual void OnProceed() OVERRIDE; - virtual void OnDontProceed() OVERRIDE; + content::RendererPreferences* prefs) override; + virtual void OnProceed() override; + virtual void OnDontProceed() override; // OAuth2LoginManager::Observer overrides. virtual void OnSessionRestoreStateChanged( Profile* user_profile, - OAuth2LoginManager::SessionRestoreState state) OVERRIDE; + OAuth2LoginManager::SessionRestoreState state) override; void NotifyBlockingPageComplete(); diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc index 72084a3..d263c9f4 100644 --- a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc +++ b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc @@ -54,14 +54,14 @@ class TestMergeSessionLoadPage : public MergeSessionLoadPage { class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); #if defined OS_CHROMEOS test_user_manager_.reset(new chromeos::ScopedTestUserManager()); #endif } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { #if defined OS_CHROMEOS // Clean up pending tasks that might depend on the user manager. base::RunLoop().RunUntilIdle(); diff --git a/chrome/browser/chromeos/login/signin/merge_session_throttle.h b/chrome/browser/chromeos/login/signin/merge_session_throttle.h index b07c57e..c0298ad 100644 --- a/chrome/browser/chromeos/login/signin/merge_session_throttle.h +++ b/chrome/browser/chromeos/login/signin/merge_session_throttle.h @@ -40,8 +40,8 @@ class MergeSessionThrottle virtual ~MergeSessionThrottle(); // content::ResourceThrottle implementation: - virtual void WillStartRequest(bool* defer) OVERRIDE; - virtual const char* GetNameForLogging() const OVERRIDE; + virtual void WillStartRequest(bool* defer) override; + virtual const char* GetNameForLogging() const override; // Checks if session is already merged. static bool AreAllSessionMergedAlready(); diff --git a/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h b/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h index cded4c3..b9dedf2 100644 --- a/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h +++ b/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h @@ -33,7 +33,7 @@ class MergeSessionXHRRequestWaiter : public OAuth2LoginManager::Observer { // OAuth2LoginManager::Observer overrides. virtual void OnSessionRestoreStateChanged( Profile* user_profile, - OAuth2LoginManager::SessionRestoreState state) OVERRIDE; + OAuth2LoginManager::SessionRestoreState state) override; // Timeout callback. void OnTimeout(); diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc index c4133ae..f4adee3 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc +++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc @@ -104,7 +104,7 @@ class OAuth2LoginManagerStateWaiter : public OAuth2LoginManager::Observer { // OAuth2LoginManager::Observer overrides. virtual void OnSessionRestoreStateChanged( Profile* user_profile, - OAuth2LoginManager::SessionRestoreState state) OVERRIDE { + OAuth2LoginManager::SessionRestoreState state) override { if (!waiting_for_state_) return; @@ -218,7 +218,7 @@ class OAuth2Test : public OobeBaseTest { protected: // OobeBaseTest overrides. - virtual Profile* profile() OVERRIDE { + virtual Profile* profile() override { if (user_manager::UserManager::Get()->GetActiveUser()) return ProfileManager::GetPrimaryUserProfile(); @@ -578,7 +578,7 @@ class DelayedFakeGaia : public FakeGaia { private: // FakeGaia overrides. virtual void HandleMergeSession(const HttpRequest& request, - BasicHttpResponse* http_response) OVERRIDE { + BasicHttpResponse* http_response) override { start_event_.Signal(); content::BrowserThread::PostTask( content::BrowserThread::UI, FROM_HERE, @@ -606,7 +606,7 @@ class MergeSessionTest : public OAuth2Test { fake_gaia_.reset(delayed_fake_gaia_); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { OAuth2Test::SetUpCommandLine(command_line); // Get fake URL for fake google.com. @@ -624,7 +624,7 @@ class MergeSessionTest : public OAuth2Test { non_google_page_url_ = non_google_url.Resolve(kRandomPagePath); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { embedded_test_server()->RegisterRequestHandler( base::Bind(&FakeGoogle::HandleRequest, base::Unretained(&fake_google_))); diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager.h b/chrome/browser/chromeos/login/signin/oauth2_login_manager.h index c0a47bc..59f7c6f 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_login_manager.h +++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager.h @@ -145,28 +145,28 @@ class OAuth2LoginManager : public KeyedService, }; // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // gaia::GaiaOAuthClient::Delegate overrides. virtual void OnRefreshTokenResponse(const std::string& access_token, - int expires_in_seconds) OVERRIDE; - virtual void OnGetUserEmailResponse(const std::string& user_email) OVERRIDE; - virtual void OnOAuthError() OVERRIDE; - virtual void OnNetworkError(int response_code) OVERRIDE; + int expires_in_seconds) override; + virtual void OnGetUserEmailResponse(const std::string& user_email) override; + virtual void OnOAuthError() override; + virtual void OnNetworkError(int response_code) override; // OAuth2LoginVerifier::Delegate overrides. - virtual void OnSessionMergeSuccess() OVERRIDE; - virtual void OnSessionMergeFailure(bool connection_error) OVERRIDE; - virtual void OnListAccountsSuccess(const std::string& data) OVERRIDE; - virtual void OnListAccountsFailure(bool connection_error) OVERRIDE; + virtual void OnSessionMergeSuccess() override; + virtual void OnSessionMergeFailure(bool connection_error) override; + virtual void OnListAccountsSuccess(const std::string& data) override; + virtual void OnListAccountsFailure(bool connection_error) override; // OAuth2TokenFetcher::Delegate overrides. virtual void OnOAuth2TokensAvailable( - const GaiaAuthConsumer::ClientOAuthResult& oauth2_tokens) OVERRIDE; - virtual void OnOAuth2TokensFetchFailed() OVERRIDE; + const GaiaAuthConsumer::ClientOAuthResult& oauth2_tokens) override; + virtual void OnOAuth2TokensFetchFailed() override; // OAuth2TokenService::Observer implementation: - virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE; + virtual void OnRefreshTokenAvailable(const std::string& account_id) override; // Signals delegate that authentication is completed, kicks off token fetching // process. diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h b/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h index c808d17..538c5e5 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h +++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h @@ -35,7 +35,7 @@ class OAuth2LoginManagerFactory // BrowserContextKeyedServiceFactory implementation. virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; DISALLOW_COPY_AND_ASSIGN(OAuth2LoginManagerFactory); }; diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_verifier.h b/chrome/browser/chromeos/login/signin/oauth2_login_verifier.h index 30ca600..ae6b97a 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_login_verifier.h +++ b/chrome/browser/chromeos/login/signin/oauth2_login_verifier.h @@ -66,22 +66,22 @@ class OAuth2LoginVerifier : public base::SupportsWeakPtr<OAuth2LoginVerifier>, RESTORE_FROM_OAUTH2_REFRESH_TOKEN = 2, }; // GaiaAuthConsumer overrides. - virtual void OnUberAuthTokenSuccess(const std::string& token) OVERRIDE; + virtual void OnUberAuthTokenSuccess(const std::string& token) override; virtual void OnUberAuthTokenFailure( - const GoogleServiceAuthError& error) OVERRIDE; - virtual void OnMergeSessionSuccess(const std::string& data) OVERRIDE; + const GoogleServiceAuthError& error) override; + virtual void OnMergeSessionSuccess(const std::string& data) override; virtual void OnMergeSessionFailure( - const GoogleServiceAuthError& error) OVERRIDE; - virtual void OnListAccountsSuccess(const std::string& data) OVERRIDE; + const GoogleServiceAuthError& error) override; + virtual void OnListAccountsSuccess(const std::string& data) override; virtual void OnListAccountsFailure( - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; // OAuth2TokenService::Consumer overrides. virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request, const std::string& access_token, - const base::Time& expiration_time) OVERRIDE; + const base::Time& expiration_time) override; virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request, - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; // Starts fetching OAuth1 access token for OAuthLogin call. void StartFetchingOAuthLoginAccessToken(Profile* profile); diff --git a/chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h b/chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h index ceda7c1..c02db10 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h +++ b/chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h @@ -53,9 +53,9 @@ class OAuth2TokenFetcher : public base::SupportsWeakPtr<OAuth2TokenFetcher>, // GaiaAuthConsumer overrides. virtual void OnClientOAuthSuccess( - const GaiaAuthConsumer::ClientOAuthResult& result) OVERRIDE; + const GaiaAuthConsumer::ClientOAuthResult& result) override; virtual void OnClientOAuthFailure( - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; OAuth2TokenFetcher::Delegate* delegate_; GaiaAuthConsumer::ClientOAuthResult oauth_tokens_; diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_authentication_unittest.cc b/chrome/browser/chromeos/login/supervised/supervised_user_authentication_unittest.cc index 425dfd8..fc99f64 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_authentication_unittest.cc +++ b/chrome/browser/chromeos/login/supervised/supervised_user_authentication_unittest.cc @@ -16,8 +16,8 @@ class SupervisedUserAuthenticationTest : public testing::Test { virtual ~SupervisedUserAuthenticationTest(); // testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; DISALLOW_COPY_AND_ASSIGN(SupervisedUserAuthenticationTest); }; diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc index 8ac7f8d..f591ac5 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc +++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc @@ -63,7 +63,7 @@ class SupervisedUserOwnerCreationTest : public SupervisedUserTestBase { public: SupervisedUserOwnerCreationTest() : SupervisedUserTestBase() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { SupervisedUserTestBase::SetUpInProcessBrowserTestFixture(); cros_settings_provider_.reset(new StubCrosSettingsProvider()); cros_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestManager)); @@ -80,7 +80,7 @@ class SupervisedUserTransactionCleanupTest2 SupervisedUserTransactionCleanupTest2() : SupervisedUserTransactionCleanupTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { SupervisedUserTransactionCleanupTest::SetUpInProcessBrowserTestFixture(); EXPECT_CALL(*mock_async_method_caller_, AsyncRemove(_, _)).Times(1); } diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h b/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h index 6ba6e1d..b5ccc32 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h @@ -54,7 +54,7 @@ class SupervisedUserCreationControllerNew // be called to actually start creating user. virtual void StartCreation(const base::string16& display_name, const std::string& password, - int avatar_index) OVERRIDE; + int avatar_index) override; // Starts import of the supervised users created prior to M35. They lack // information about password. @@ -65,7 +65,7 @@ class SupervisedUserCreationControllerNew const std::string& password, int avatar_index, const std::string& sync_id, - const std::string& master_key) OVERRIDE; + const std::string& master_key) override; // Configures and initiates importing existing supervised user to this device. // Existing user is identified by |sync_id|, has |display_name|, @@ -78,14 +78,14 @@ class SupervisedUserCreationControllerNew const std::string& master_key, const base::DictionaryValue* password_data, const std::string& encryption_key, - const std::string& signature_key) OVERRIDE; + const std::string& signature_key) override; - virtual void SetManagerProfile(Profile* manager_profile) OVERRIDE; - virtual Profile* GetManagerProfile() OVERRIDE; + virtual void SetManagerProfile(Profile* manager_profile) override; + virtual Profile* GetManagerProfile() override; - virtual void CancelCreation() OVERRIDE; - virtual void FinishCreation() OVERRIDE; - virtual std::string GetSupervisedUserId() OVERRIDE; + virtual void CancelCreation() override; + virtual void FinishCreation() override; + virtual std::string GetSupervisedUserId() override; private: enum Stage { @@ -147,7 +147,7 @@ class SupervisedUserCreationControllerNew // SupervisedUserAuthenticator::StatusConsumer overrides. virtual void OnAuthenticationFailure(ExtendedAuthenticator::AuthState error) - OVERRIDE; + override; // Authenticator success callbacks. void OnMountSuccess(const std::string& mount_hash); diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h b/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h index 5d06382..0353a8f 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h @@ -21,16 +21,16 @@ class SupervisedUserCreationFlow : public ExtendedUserFlow { explicit SupervisedUserCreationFlow(const std::string& manager_id); virtual ~SupervisedUserCreationFlow(); - virtual bool CanLockScreen() OVERRIDE; - virtual bool ShouldShowSettings() OVERRIDE; - virtual bool ShouldLaunchBrowser() OVERRIDE; - virtual bool ShouldSkipPostLoginScreens() OVERRIDE; - virtual bool HandleLoginFailure(const AuthFailure& failure) OVERRIDE; - virtual void HandleLoginSuccess(const UserContext& context) OVERRIDE; - virtual bool HandlePasswordChangeDetected() OVERRIDE; + virtual bool CanLockScreen() override; + virtual bool ShouldShowSettings() override; + virtual bool ShouldLaunchBrowser() override; + virtual bool ShouldSkipPostLoginScreens() override; + virtual bool HandleLoginFailure(const AuthFailure& failure) override; + virtual void HandleLoginSuccess(const UserContext& context) override; + virtual bool HandlePasswordChangeDetected() override; virtual void HandleOAuthTokenStatusChange( - user_manager::User::OAuthTokenStatus status) OVERRIDE; - virtual void LaunchExtraSteps(Profile* profile) OVERRIDE; + user_manager::User::OAuthTokenStatus status) override; + virtual void LaunchExtraSteps(Profile* profile) override; private: // Display name for user being created. base::string16 name_; diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h index c1f44d52..263d32a 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h @@ -66,63 +66,63 @@ class SupervisedUserCreationScreen void ShowInitialScreen(); // CameraPresenceNotifier::Observer implementation: - virtual void OnCameraPresenceCheckDone(bool is_camera_present) OVERRIDE; + virtual void OnCameraPresenceCheckDone(bool is_camera_present) override; // SupervisedUserSyncServiceObserver implementation virtual void OnSupervisedUserAcknowledged( - const std::string& supervised_user_id) OVERRIDE {} - virtual void OnSupervisedUsersSyncingStopped() OVERRIDE {} - virtual void OnSupervisedUsersChanged() OVERRIDE; + const std::string& supervised_user_id) override {} + virtual void OnSupervisedUsersSyncingStopped() override {} + virtual void OnSupervisedUsersChanged() override; // WizardScreen implementation: - virtual void PrepareToShow() OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void PrepareToShow() override; + virtual void Show() override; + virtual void Hide() override; + virtual std::string GetName() const override; // SupervisedUserCreationScreenHandler::Delegate implementation: virtual void OnActorDestroyed(SupervisedUserCreationScreenHandler* actor) - OVERRIDE; + override; virtual void CreateSupervisedUser( const base::string16& display_name, - const std::string& supervised_user_password) OVERRIDE; - virtual void ImportSupervisedUser(const std::string& user_id) OVERRIDE; + const std::string& supervised_user_password) override; + virtual void ImportSupervisedUser(const std::string& user_id) override; virtual void ImportSupervisedUserWithPassword( const std::string& user_id, - const std::string& password) OVERRIDE; + const std::string& password) override; virtual void AuthenticateManager( const std::string& manager_id, - const std::string& manager_password) OVERRIDE; - virtual void AbortFlow() OVERRIDE; - virtual void FinishFlow() OVERRIDE; + const std::string& manager_password) override; + virtual void AbortFlow() override; + virtual void FinishFlow() override; virtual bool FindUserByDisplayName(const base::string16& display_name, - std::string *out_id) const OVERRIDE; - virtual void OnPageSelected(const std::string& page) OVERRIDE; + std::string *out_id) const override; + virtual void OnPageSelected(const std::string& page) override; // SupervisedUserController::StatusConsumer overrides. virtual void OnCreationError(SupervisedUserCreationController::ErrorCode code) - OVERRIDE; - virtual void OnCreationTimeout() OVERRIDE; - virtual void OnCreationSuccess() OVERRIDE; - virtual void OnLongCreationWarning() OVERRIDE; + override; + virtual void OnCreationTimeout() override; + virtual void OnCreationSuccess() override; + virtual void OnLongCreationWarning() override; // NetworkPortalDetector::Observer implementation: virtual void OnPortalDetectionCompleted( const NetworkState* network, - const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE; + const NetworkPortalDetector::CaptivePortalState& state) override; // TODO(antrim) : this is an explicit code duplications with UserImageScreen. // It should be removed by issue 251179. // SupervisedUserCreationScreenHandler::Delegate (image) implementation: - virtual void OnPhotoTaken(const std::string& raw_data) OVERRIDE; + virtual void OnPhotoTaken(const std::string& raw_data) override; virtual void OnImageSelected(const std::string& image_url, - const std::string& image_type) OVERRIDE; - virtual void OnImageAccepted() OVERRIDE; + const std::string& image_type) override; + virtual void OnImageAccepted() override; // ImageDecoder::Delegate overrides: virtual void OnImageDecoded(const ImageDecoder* decoder, - const SkBitmap& decoded_image) OVERRIDE; - virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE; + const SkBitmap& decoded_image) override; + virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override; private: void ApplyPicture(); diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h b/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h index 0bbe94b..23c90a7 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h @@ -24,19 +24,19 @@ class SupervisedUserLoginFlow virtual ~SupervisedUserLoginFlow(); // ExtendedUserFlow overrides. - virtual bool CanLockScreen() OVERRIDE; - virtual bool ShouldLaunchBrowser() OVERRIDE; - virtual bool ShouldSkipPostLoginScreens() OVERRIDE; - virtual bool HandleLoginFailure(const AuthFailure& failure) OVERRIDE; - virtual void HandleLoginSuccess(const UserContext& context) OVERRIDE; - virtual bool HandlePasswordChangeDetected() OVERRIDE; + virtual bool CanLockScreen() override; + virtual bool ShouldLaunchBrowser() override; + virtual bool ShouldSkipPostLoginScreens() override; + virtual bool HandleLoginFailure(const AuthFailure& failure) override; + virtual void HandleLoginSuccess(const UserContext& context) override; + virtual bool HandlePasswordChangeDetected() override; virtual void HandleOAuthTokenStatusChange( - user_manager::User::OAuthTokenStatus status) OVERRIDE; - virtual void LaunchExtraSteps(Profile* profile) OVERRIDE; + user_manager::User::OAuthTokenStatus status) override; + virtual void LaunchExtraSteps(Profile* profile) override; // ExtendedAuthenticator::NewAuthStatusConsumer overrides. virtual void OnAuthenticationFailure(ExtendedAuthenticator::AuthState state) - OVERRIDE; + override; private: void Launch(); diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h index fe9f5a4..39cc791 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h @@ -69,12 +69,12 @@ class SupervisedUserTestBase : public chromeos::LoginManagerTest { SupervisedUserTestBase(); virtual ~SupervisedUserTestBase(); - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; + virtual void SetUpInProcessBrowserTestFixture() override; protected: - virtual void TearDown() OVERRIDE; + virtual void TearDown() override; - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE; + virtual void TearDownInProcessBrowserTestFixture() override; void JSEval(const std::string& script); diff --git a/chrome/browser/chromeos/login/test/app_window_waiter.h b/chrome/browser/chromeos/login/test/app_window_waiter.h index 91eadcd..35d21b6 100644 --- a/chrome/browser/chromeos/login/test/app_window_waiter.h +++ b/chrome/browser/chromeos/login/test/app_window_waiter.h @@ -29,7 +29,7 @@ class AppWindowWaiter : public extensions::AppWindowRegistry::Observer { extensions::AppWindow* Wait(); // AppWindowRegistry::Observer: - virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE; + virtual void OnAppWindowAdded(extensions::AppWindow* app_window) override; private: extensions::AppWindowRegistry* registry_; diff --git a/chrome/browser/chromeos/login/test/https_forwarder.h b/chrome/browser/chromeos/login/test/https_forwarder.h index eaad6fd..ae76443 100644 --- a/chrome/browser/chromeos/login/test/https_forwarder.h +++ b/chrome/browser/chromeos/login/test/https_forwarder.h @@ -20,11 +20,11 @@ class HTTPSForwarder : public net::LocalTestServer { virtual ~HTTPSForwarder(); // net::LocalTestServer: - virtual bool SetPythonPath() const OVERRIDE; + virtual bool SetPythonPath() const override; virtual bool GetTestServerPath( - base::FilePath* testserver_path) const OVERRIDE; + base::FilePath* testserver_path) const override; virtual bool GenerateAdditionalArguments( - base::DictionaryValue* arguments) const OVERRIDE; + base::DictionaryValue* arguments) const override; private: GURL forward_target_; diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.h b/chrome/browser/chromeos/login/test/oobe_base_test.h index eb37bcc..5920160 100644 --- a/chrome/browser/chromeos/login/test/oobe_base_test.h +++ b/chrome/browser/chromeos/login/test/oobe_base_test.h @@ -35,11 +35,11 @@ class OobeBaseTest : public ExtensionApiTest { protected: // InProcessBrowserTest overrides. - virtual void SetUp() OVERRIDE; - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; - virtual void TearDownOnMainThread() OVERRIDE; - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; + virtual void SetUp() override; + virtual void SetUpInProcessBrowserTestFixture() override; + virtual void SetUpOnMainThread() override; + virtual void TearDownOnMainThread() override; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; // Network status control functions. void SimulateNetworkOffline(); diff --git a/chrome/browser/chromeos/login/test/oobe_screen_waiter.h b/chrome/browser/chromeos/login/test/oobe_screen_waiter.h index 4c9affd..c1fa8c7 100644 --- a/chrome/browser/chromeos/login/test/oobe_screen_waiter.h +++ b/chrome/browser/chromeos/login/test/oobe_screen_waiter.h @@ -32,7 +32,7 @@ class OobeScreenWaiter : public OobeUI::Observer { // OobeUI::Observer implementation: virtual void OnCurrentScreenChanged( OobeDisplay::Screen current_screen, - OobeDisplay::Screen new_screen) OVERRIDE; + OobeDisplay::Screen new_screen) override; private: OobeUI* GetOobeUI(); diff --git a/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h b/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h index 656f731..9e565f6 100644 --- a/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h +++ b/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h @@ -27,7 +27,7 @@ class WizardInProcessBrowserTest : public InProcessBrowserTest { explicit WizardInProcessBrowserTest(const char* screen_name); // Overridden from InProcessBrowserTest: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; protected: // Can be overriden by derived test fixtures to set up environment after @@ -35,9 +35,9 @@ class WizardInProcessBrowserTest : public InProcessBrowserTest { virtual void SetUpWizard() {} // Overriden from InProcessBrowserTest: - virtual void SetUpOnMainThread() OVERRIDE; - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; - virtual void TearDownOnMainThread() OVERRIDE; + virtual void SetUpOnMainThread() override; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; + virtual void TearDownOnMainThread() override; private: std::string screen_name_; diff --git a/chrome/browser/chromeos/login/test_login_utils.h b/chrome/browser/chromeos/login/test_login_utils.h index 8b62460..7954baa 100644 --- a/chrome/browser/chromeos/login/test_login_utils.h +++ b/chrome/browser/chromeos/login/test_login_utils.h @@ -25,19 +25,19 @@ class TestLoginUtils : public LoginUtils { // LoginUtils: virtual void RespectLocalePreference(Profile* profile, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; virtual void DoBrowserLaunch(Profile* profile, - LoginDisplayHost* login_host) OVERRIDE {} + LoginDisplayHost* login_host) override {} virtual void PrepareProfile(const UserContext& user_context, bool has_auth_cookies, bool has_active_session, - Delegate* delegate) OVERRIDE; - virtual void DelegateDeleted(Delegate* delegate) OVERRIDE; - virtual void CompleteOffTheRecordLogin(const GURL& start_url) OVERRIDE {} + Delegate* delegate) override; + virtual void DelegateDeleted(Delegate* delegate) override; + virtual void CompleteOffTheRecordLogin(const GURL& start_url) override {} virtual scoped_refptr<Authenticator> CreateAuthenticator( - AuthStatusConsumer* consumer) OVERRIDE; + AuthStatusConsumer* consumer) override; virtual bool RestartToApplyPerSessionFlagsIfNeed(Profile* profile, - bool early_restart) OVERRIDE; + bool early_restart) override; private: UserContext expected_user_context_; diff --git a/chrome/browser/chromeos/login/ui/captive_portal_view.h b/chrome/browser/chromeos/login/ui/captive_portal_view.h index 2bc4268..9febccc 100644 --- a/chrome/browser/chromeos/login/ui/captive_portal_view.h +++ b/chrome/browser/chromeos/login/ui/captive_portal_view.h @@ -21,19 +21,19 @@ class CaptivePortalView : public SimpleWebViewDialog { void StartLoad(); // Overridden from views::WidgetDelegate: - virtual bool CanResize() const OVERRIDE; - virtual ui::ModalType GetModalType() const OVERRIDE; - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual bool ShouldShowWindowTitle() const OVERRIDE; + virtual bool CanResize() const override; + virtual ui::ModalType GetModalType() const override; + virtual base::string16 GetWindowTitle() const override; + virtual bool ShouldShowWindowTitle() const override; virtual views::NonClientFrameView* CreateNonClientFrameView( - views::Widget* widget) OVERRIDE; + views::Widget* widget) override; // Overridden from content::WebContentsDelegate: virtual void NavigationStateChanged( const content::WebContents* source, - content::InvalidateTypes changed_flags) OVERRIDE; + content::InvalidateTypes changed_flags) override; virtual void LoadingStateChanged(content::WebContents* source, - bool to_different_document) OVERRIDE; + bool to_different_document) override; private: // Contains CaptivePortalWindowProxy to be notified when redirection state is diff --git a/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc b/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc index ef6b6ba..34a0103 100644 --- a/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc +++ b/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc @@ -33,7 +33,7 @@ class CaptivePortalWindowProxyStubDelegate virtual ~CaptivePortalWindowProxyStubDelegate() { } - virtual void OnPortalDetected() OVERRIDE { + virtual void OnPortalDetected() override { ++num_portal_notifications_; } @@ -74,12 +74,12 @@ class CaptivePortalWindowTest : public InProcessBrowserTest { ASSERT_EQ(num_portal_notifications, delegate_.num_portal_notifications()); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); command_line->AppendSwitch(chromeos::switches::kLoginManager); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { host_ = LoginDisplayHostImpl::default_host(); CHECK(host_); content::WebContents* web_contents = @@ -89,7 +89,7 @@ class CaptivePortalWindowTest : public InProcessBrowserTest { new CaptivePortalWindowProxy(&delegate_, web_contents)); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { captive_portal_window_proxy_.reset(); base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_); base::MessageLoopForUI::current()->RunUntilIdle(); @@ -179,7 +179,7 @@ class CaptivePortalWindowCtorDtorTest : public LoginManagerTest { : LoginManagerTest(false) {} virtual ~CaptivePortalWindowCtorDtorTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { LoginManagerTest::SetUpInProcessBrowserTestFixture(); network_portal_detector_ = new NetworkPortalDetectorTestImpl(); diff --git a/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h b/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h index 268b041..2ed00e2 100644 --- a/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h +++ b/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h @@ -62,9 +62,9 @@ class CaptivePortalWindowProxy : public views::WidgetObserver { void OnOriginalURLLoaded(); // Overridden from views::WidgetObserver: - virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; - virtual void OnWidgetDestroyed(views::Widget* widget) OVERRIDE; + virtual void OnWidgetClosing(views::Widget* widget) override; + virtual void OnWidgetDestroying(views::Widget* widget) override; + virtual void OnWidgetDestroyed(views::Widget* widget) override; private: friend class CaptivePortalWindowTest; diff --git a/chrome/browser/chromeos/login/ui/input_events_blocker.h b/chrome/browser/chromeos/login/ui/input_events_blocker.h index 6f8060c..82efb87 100644 --- a/chrome/browser/chromeos/login/ui/input_events_blocker.h +++ b/chrome/browser/chromeos/login/ui/input_events_blocker.h @@ -18,10 +18,10 @@ class InputEventsBlocker : public ui::EventHandler { InputEventsBlocker(); virtual ~InputEventsBlocker(); - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; private: DISALLOW_COPY_AND_ASSIGN(InputEventsBlocker); diff --git a/chrome/browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h b/chrome/browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h index be41446..beeb0ad 100644 --- a/chrome/browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h +++ b/chrome/browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h @@ -19,7 +19,7 @@ class KeyboardDrivenOobeKeyHandler : public ui::EventHandler { private: // ui::EventHandler - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; DISALLOW_COPY_AND_ASSIGN(KeyboardDrivenOobeKeyHandler); }; diff --git a/chrome/browser/chromeos/login/ui/lock_window_aura.h b/chrome/browser/chromeos/login/ui/lock_window_aura.h index ff35e1e..4e56eb1 100644 --- a/chrome/browser/chromeos/login/ui/lock_window_aura.h +++ b/chrome/browser/chromeos/login/ui/lock_window_aura.h @@ -17,12 +17,12 @@ class LockWindowAura : public views::Widget, public LockWindow { public: // LockWindow implementation: - virtual void Grab() OVERRIDE; - virtual views::Widget* GetWidget() OVERRIDE; + virtual void Grab() override; + virtual views::Widget* GetWidget() override; // views::WidgetDelegate implementation: - virtual views::View* GetInitiallyFocusedView() OVERRIDE; - virtual const views::Widget* GetWidget() const OVERRIDE; + virtual views::View* GetInitiallyFocusedView() override; + virtual const views::Widget* GetWidget() const override; private: friend class LockWindow; diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc index d25cf28..e078e82 100644 --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc @@ -148,7 +148,7 @@ class AnimationObserver : public ui::ImplicitAnimationObserver { private: // ui::ImplicitAnimationObserver implementation: - virtual void OnImplicitAnimationsCompleted() OVERRIDE { + virtual void OnImplicitAnimationsCompleted() override { callback_.Run(); delete this; } @@ -222,19 +222,19 @@ class LoginWidgetDelegate : public views::WidgetDelegate { virtual ~LoginWidgetDelegate() {} // Overridden from WidgetDelegate: - virtual void DeleteDelegate() OVERRIDE { + virtual void DeleteDelegate() override { delete this; } - virtual views::Widget* GetWidget() OVERRIDE { + virtual views::Widget* GetWidget() override { return widget_; } - virtual const views::Widget* GetWidget() const OVERRIDE { + virtual const views::Widget* GetWidget() const override { return widget_; } - virtual bool CanActivate() const OVERRIDE { + virtual bool CanActivate() const override { return true; } - virtual bool ShouldAdvanceFocusToTopLevelWidget() const OVERRIDE { + virtual bool ShouldAdvanceFocusToTopLevelWidget() const override { return true; } diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.h b/chrome/browser/chromeos/login/ui/login_display_host_impl.h index 06b809e..9a602c3 100644 --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.h +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.h @@ -67,29 +67,29 @@ class LoginDisplayHostImpl : public LoginDisplayHost, // LoginDisplayHost implementation: virtual LoginDisplay* CreateLoginDisplay( - LoginDisplay::Delegate* delegate) OVERRIDE; - virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; - virtual WebUILoginView* GetWebUILoginView() const OVERRIDE; - virtual void BeforeSessionStart() OVERRIDE; - virtual void Finalize() OVERRIDE; - virtual void OnCompleteLogin() OVERRIDE; - virtual void OpenProxySettings() OVERRIDE; - virtual void SetStatusAreaVisible(bool visible) OVERRIDE; - virtual AutoEnrollmentController* GetAutoEnrollmentController() OVERRIDE; + LoginDisplay::Delegate* delegate) override; + virtual gfx::NativeWindow GetNativeWindow() const override; + virtual WebUILoginView* GetWebUILoginView() const override; + virtual void BeforeSessionStart() override; + virtual void Finalize() override; + virtual void OnCompleteLogin() override; + virtual void OpenProxySettings() override; + virtual void SetStatusAreaVisible(bool visible) override; + virtual AutoEnrollmentController* GetAutoEnrollmentController() override; virtual void StartWizard( const std::string& first_screen_name, - scoped_ptr<base::DictionaryValue> screen_parameters) OVERRIDE; - virtual WizardController* GetWizardController() OVERRIDE; - virtual AppLaunchController* GetAppLaunchController() OVERRIDE; + scoped_ptr<base::DictionaryValue> screen_parameters) override; + virtual WizardController* GetWizardController() override; + virtual AppLaunchController* GetAppLaunchController() override; virtual void StartUserAdding( - const base::Closure& completion_callback) OVERRIDE; - virtual void StartSignInScreen(const LoginScreenContext& context) OVERRIDE; - virtual void ResumeSignInScreen() OVERRIDE; - virtual void OnPreferencesChanged() OVERRIDE; - virtual void PrewarmAuthentication() OVERRIDE; + const base::Closure& completion_callback) override; + virtual void StartSignInScreen(const LoginScreenContext& context) override; + virtual void ResumeSignInScreen() override; + virtual void OnPreferencesChanged() override; + virtual void PrewarmAuthentication() override; virtual void StartAppLaunch(const std::string& app_id, - bool diagnostic_mode) OVERRIDE; - virtual void StartDemoAppLaunch() OVERRIDE; + bool diagnostic_mode) override; + virtual void StartDemoAppLaunch() override; // Creates WizardController instance. WizardController* CreateWizardController(); @@ -112,32 +112,32 @@ class LoginDisplayHostImpl : public LoginDisplayHost, // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Overridden from content::WebContentsObserver: - virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; + virtual void RenderProcessGone(base::TerminationStatus status) override; // Overridden from chromeos::SessionManagerClient::Observer: - virtual void EmitLoginPromptVisibleCalled() OVERRIDE; + virtual void EmitLoginPromptVisibleCalled() override; // Overridden from chromeos::CrasAudioHandler::AudioObserver: - virtual void OnActiveOutputNodeChanged() OVERRIDE; + virtual void OnActiveOutputNodeChanged() override; // Overridden from ash::KeyboardStateObserver: - virtual void OnVirtualKeyboardStateChanged(bool activated) OVERRIDE; + virtual void OnVirtualKeyboardStateChanged(bool activated) override; // Overridden from keyboard::KeyboardControllerObserver: - virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE; + virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; // Overridden from gfx::DisplayObserver: - virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; + virtual void OnDisplayAdded(const gfx::Display& new_display) override; + virtual void OnDisplayRemoved(const gfx::Display& old_display) override; virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t changed_metrics) OVERRIDE; + uint32_t changed_metrics) override; // Overriden from views::WidgetRemovalsObserver: virtual void OnWillRemoveView(views::Widget* widget, - views::View* view) OVERRIDE; + views::View* view) override; private: // Way to restore if renderer have crashed. diff --git a/chrome/browser/chromeos/login/ui/login_web_dialog.h b/chrome/browser/chromeos/login/ui/login_web_dialog.h index ec588e1..c9d38cd 100644 --- a/chrome/browser/chromeos/login/ui/login_web_dialog.h +++ b/chrome/browser/chromeos/login/ui/login_web_dialog.h @@ -65,29 +65,29 @@ class LoginWebDialog : public ui::WebDialogDelegate, protected: // ui::WebDialogDelegate implementation. - virtual ui::ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ui::ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; - virtual void GetMinimumDialogSize(gfx::Size* size) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const override; + virtual void GetDialogSize(gfx::Size* size) const override; + virtual void GetMinimumDialogSize(gfx::Size* size) const override; + virtual std::string GetDialogArgs() const override; virtual void OnDialogShown( content::WebUI* webui, - content::RenderViewHost* render_view_host) OVERRIDE; + content::RenderViewHost* render_view_host) override; // NOTE: This function deletes this object at the end. - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnCloseContents( - content::WebContents* source, bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + content::WebContents* source, bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; virtual bool HandleContextMenu( - const content::ContextMenuParams& params) OVERRIDE; + const content::ContextMenuParams& params) override; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: content::BrowserContext* browser_context_; diff --git a/chrome/browser/chromeos/login/ui/mock_login_display_host.h b/chrome/browser/chromeos/login/ui/mock_login_display_host.h index 1318d07..52ab98d 100644 --- a/chrome/browser/chromeos/login/ui/mock_login_display_host.h +++ b/chrome/browser/chromeos/login/ui/mock_login_display_host.h @@ -33,7 +33,7 @@ class MockLoginDisplayHost : public LoginDisplayHost { MOCK_METHOD2(StartWizardPtr, void(const std::string&, base::DictionaryValue*)); virtual void StartWizard(const std::string& name, - scoped_ptr<base::DictionaryValue> value) OVERRIDE; + scoped_ptr<base::DictionaryValue> value) override; MOCK_METHOD0(GetWizardController, WizardController*(void)); MOCK_METHOD0(GetAppLaunchController, AppLaunchController*(void)); MOCK_METHOD1(StartUserAdding, void(const base::Closure&)); diff --git a/chrome/browser/chromeos/login/ui/proxy_settings_dialog.h b/chrome/browser/chromeos/login/ui/proxy_settings_dialog.h index 1c1b900..b6b5df6 100644 --- a/chrome/browser/chromeos/login/ui/proxy_settings_dialog.h +++ b/chrome/browser/chromeos/login/ui/proxy_settings_dialog.h @@ -30,7 +30,7 @@ class ProxySettingsDialog : public LoginWebDialog { protected: // ui::WebDialogDelegate implementation. - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + virtual void OnDialogClosed(const std::string& json_retval) override; private: // TODO(altimofeev): consider avoidance static variable by extending current diff --git a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc index 61b72c3..a982b33 100644 --- a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc +++ b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc @@ -107,13 +107,13 @@ class StubBubbleModelDelegate : public ContentSettingBubbleModelDelegate { // ContentSettingBubbleModelDelegate implementation: virtual void ShowCollectedCookiesDialog( - content::WebContents* web_contents) OVERRIDE { + content::WebContents* web_contents) override { } - virtual void ShowContentSettingsPage(ContentSettingsType type) OVERRIDE { + virtual void ShowContentSettingsPage(ContentSettingsType type) override { } - virtual void ShowLearnMorePage(ContentSettingsType type) OVERRIDE { + virtual void ShowLearnMorePage(ContentSettingsType type) override { } private: diff --git a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h index 566e19e..2ce2926 100644 --- a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h +++ b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h @@ -53,51 +53,51 @@ class SimpleWebViewDialog : public views::ButtonListener, void Init(); // Overridden from views::View: - virtual void Layout() OVERRIDE; + virtual void Layout() override; // Overridden from views::WidgetDelegate: - virtual views::View* GetContentsView() OVERRIDE; - virtual views::View* GetInitiallyFocusedView() OVERRIDE; + virtual views::View* GetContentsView() override; + virtual views::View* GetInitiallyFocusedView() override; // Implements views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Implements content::PageNavigator: virtual content::WebContents* OpenURL( - const content::OpenURLParams& params) OVERRIDE; + const content::OpenURLParams& params) override; // Implements content::WebContentsDelegate: virtual void NavigationStateChanged( const content::WebContents* source, - content::InvalidateTypes changed_flags) OVERRIDE; + content::InvalidateTypes changed_flags) override; virtual void LoadingStateChanged(content::WebContents* source, - bool to_different_document) OVERRIDE; + bool to_different_document) override; // Implements LocationBarView::Delegate: - virtual content::WebContents* GetWebContents() OVERRIDE; - virtual ToolbarModel* GetToolbarModel() OVERRIDE; - virtual const ToolbarModel* GetToolbarModel() const OVERRIDE; - virtual InstantController* GetInstant() OVERRIDE; + virtual content::WebContents* GetWebContents() override; + virtual ToolbarModel* GetToolbarModel() override; + virtual const ToolbarModel* GetToolbarModel() const override; + virtual InstantController* GetInstant() override; virtual views::Widget* CreateViewsBubble( - views::BubbleDelegateView* bubble_delegate) OVERRIDE; + views::BubbleDelegateView* bubble_delegate) override; virtual PageActionImageView* CreatePageActionImageView( LocationBarView* owner, - ExtensionAction* action) OVERRIDE; + ExtensionAction* action) override; virtual ContentSettingBubbleModelDelegate* - GetContentSettingBubbleModelDelegate() OVERRIDE; + GetContentSettingBubbleModelDelegate() override; virtual void ShowWebsiteSettings(content::WebContents* web_contents, const GURL& url, - const content::SSLStatus& ssl) OVERRIDE; + const content::SSLStatus& ssl) override; // Implements ToolbarModelDelegate: - virtual content::WebContents* GetActiveWebContents() const OVERRIDE; - virtual bool InTabbedBrowser() const OVERRIDE; + virtual content::WebContents* GetActiveWebContents() const override; + virtual bool InTabbedBrowser() const override; // Implements CommandUpdaterDelegate: virtual void ExecuteCommandWithDisposition( int id, - WindowOpenDisposition) OVERRIDE; + WindowOpenDisposition) override; private: friend class SimpleWebViewDialogTest; diff --git a/chrome/browser/chromeos/login/ui/simple_web_view_dialog_browsertest.cc b/chrome/browser/chromeos/login/ui/simple_web_view_dialog_browsertest.cc index 2023fd4..79436cc 100644 --- a/chrome/browser/chromeos/login/ui/simple_web_view_dialog_browsertest.cc +++ b/chrome/browser/chromeos/login/ui/simple_web_view_dialog_browsertest.cc @@ -23,7 +23,7 @@ class StubDelegate : public CaptivePortalWindowProxyDelegate { public: StubDelegate() {} virtual ~StubDelegate() {} - virtual void OnPortalDetected() OVERRIDE {} + virtual void OnPortalDetected() override {} private: DISALLOW_COPY_AND_ASSIGN(StubDelegate); @@ -41,7 +41,7 @@ class InterstitialPageDelegate : public content::InterstitialPageDelegate { private: // InterstitialPageDelegate implementation: - virtual std::string GetHTMLContents() OVERRIDE { return "HTML Contents"; } + virtual std::string GetHTMLContents() override { return "HTML Contents"; } DISALLOW_COPY_AND_ASSIGN(InterstitialPageDelegate); }; diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen.cc b/chrome/browser/chromeos/login/ui/user_adding_screen.cc index f9005af..b874f66 100644 --- a/chrome/browser/chromeos/login/ui/user_adding_screen.cc +++ b/chrome/browser/chromeos/login/ui/user_adding_screen.cc @@ -25,12 +25,12 @@ namespace { class UserAddingScreenImpl : public UserAddingScreen { public: - virtual void Start() OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual bool IsRunning() OVERRIDE; + virtual void Start() override; + virtual void Cancel() override; + virtual bool IsRunning() override; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; static UserAddingScreenImpl* GetInstance(); private: diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc index a1e1174..002f353 100644 --- a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc @@ -41,14 +41,14 @@ class UserAddingScreenTest : public LoginManagerTest, user_adding_finished_(0) { } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { LoginManagerTest::SetUpInProcessBrowserTestFixture(); UserAddingScreen::Get()->AddObserver(this); } - virtual void OnUserAddingFinished() OVERRIDE { ++user_adding_finished_; } + virtual void OnUserAddingFinished() override { ++user_adding_finished_; } - virtual void OnUserAddingStarted() OVERRIDE { ++user_adding_started_; } + virtual void OnUserAddingStarted() override { ++user_adding_started_; } void SetUserCanLock(user_manager::User* user, bool can_lock) { user->set_can_lock(can_lock); diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h b/chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h index cb5a37d..c5384e6 100644 --- a/chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h +++ b/chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h @@ -23,8 +23,8 @@ class UserAddingScreenInputMethodsController virtual ~UserAddingScreenInputMethodsController(); // UserAddingScreen::Observer implementation: - virtual void OnUserAddingStarted() OVERRIDE; - virtual void OnUserAddingFinished() OVERRIDE; + virtual void OnUserAddingStarted() override; + virtual void OnUserAddingFinished() override; private: UserAddingScreen* screen_; diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.h b/chrome/browser/chromeos/login/ui/webui_login_display.h index bdcb0fd..81e0624 100644 --- a/chrome/browser/chromeos/login/ui/webui_login_display.h +++ b/chrome/browser/chromeos/login/ui/webui_login_display.h @@ -30,66 +30,66 @@ class WebUILoginDisplay : public LoginDisplay, virtual ~WebUILoginDisplay(); // LoginDisplay implementation: - virtual void ClearAndEnablePassword() OVERRIDE; + virtual void ClearAndEnablePassword() override; virtual void Init(const user_manager::UserList& users, bool show_guest, bool show_users, - bool show_new_user) OVERRIDE; - virtual void OnPreferencesChanged() OVERRIDE; - virtual void OnBeforeUserRemoved(const std::string& username) OVERRIDE; - virtual void OnUserImageChanged(const user_manager::User& user) OVERRIDE; - virtual void OnUserRemoved(const std::string& username) OVERRIDE; - virtual void SetUIEnabled(bool is_enabled) OVERRIDE; + bool show_new_user) override; + virtual void OnPreferencesChanged() override; + virtual void OnBeforeUserRemoved(const std::string& username) override; + virtual void OnUserImageChanged(const user_manager::User& user) override; + virtual void OnUserRemoved(const std::string& username) override; + virtual void SetUIEnabled(bool is_enabled) override; virtual void ShowError(int error_msg_id, int login_attempts, - HelpAppLauncher::HelpTopic help_topic_id) OVERRIDE; - virtual void ShowErrorScreen(LoginDisplay::SigninError error_id) OVERRIDE; - virtual void ShowGaiaPasswordChanged(const std::string& username) OVERRIDE; - virtual void ShowPasswordChangedDialog(bool show_password_error) OVERRIDE; - virtual void ShowSigninUI(const std::string& email) OVERRIDE; + HelpAppLauncher::HelpTopic help_topic_id) override; + virtual void ShowErrorScreen(LoginDisplay::SigninError error_id) override; + virtual void ShowGaiaPasswordChanged(const std::string& username) override; + virtual void ShowPasswordChangedDialog(bool show_password_error) override; + virtual void ShowSigninUI(const std::string& email) override; // NativeWindowDelegate implementation: - virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; + virtual gfx::NativeWindow GetNativeWindow() const override; // SigninScreenHandlerDelegate implementation: - virtual void CancelPasswordChangedFlow() OVERRIDE; - virtual void ResyncUserData() OVERRIDE; - virtual void MigrateUserData(const std::string& old_password) OVERRIDE; + virtual void CancelPasswordChangedFlow() override; + virtual void ResyncUserData() override; + virtual void MigrateUserData(const std::string& old_password) override; virtual void Login(const UserContext& user_context, - const SigninSpecifics& specifics) OVERRIDE; - virtual bool IsSigninInProgress() const OVERRIDE; - virtual void Signout() OVERRIDE; - virtual void CreateAccount() OVERRIDE; - virtual void CompleteLogin(const UserContext& user_context) OVERRIDE; - - virtual void OnSigninScreenReady() OVERRIDE; - virtual void CancelUserAdding() OVERRIDE; - virtual void LoadWallpaper(const std::string& username) OVERRIDE; - virtual void LoadSigninWallpaper() OVERRIDE; - virtual void RemoveUser(const std::string& username) OVERRIDE; - virtual void ShowEnterpriseEnrollmentScreen() OVERRIDE; - virtual void ShowKioskEnableScreen() OVERRIDE; - virtual void ShowKioskAutolaunchScreen() OVERRIDE; - virtual void ShowWrongHWIDScreen() OVERRIDE; + const SigninSpecifics& specifics) override; + virtual bool IsSigninInProgress() const override; + virtual void Signout() override; + virtual void CreateAccount() override; + virtual void CompleteLogin(const UserContext& user_context) override; + + virtual void OnSigninScreenReady() override; + virtual void CancelUserAdding() override; + virtual void LoadWallpaper(const std::string& username) override; + virtual void LoadSigninWallpaper() override; + virtual void RemoveUser(const std::string& username) override; + virtual void ShowEnterpriseEnrollmentScreen() override; + virtual void ShowKioskEnableScreen() override; + virtual void ShowKioskAutolaunchScreen() override; + virtual void ShowWrongHWIDScreen() override; virtual void SetWebUIHandler( - LoginDisplayWebUIHandler* webui_handler) OVERRIDE; + LoginDisplayWebUIHandler* webui_handler) override; virtual void ShowSigninScreenForCreds(const std::string& username, const std::string& password); - virtual const user_manager::UserList& GetUsers() const OVERRIDE; - virtual bool IsShowGuest() const OVERRIDE; - virtual bool IsShowUsers() const OVERRIDE; - virtual bool IsUserSigninCompleted() const OVERRIDE; - virtual void SetDisplayEmail(const std::string& email) OVERRIDE; - virtual void HandleGetUsers() OVERRIDE; + virtual const user_manager::UserList& GetUsers() const override; + virtual bool IsShowGuest() const override; + virtual bool IsShowUsers() const override; + virtual bool IsUserSigninCompleted() const override; + virtual void SetDisplayEmail(const std::string& email) override; + virtual void HandleGetUsers() override; virtual void SetAuthType( const std::string& username, - ScreenlockBridge::LockHandler::AuthType auth_type) OVERRIDE; + ScreenlockBridge::LockHandler::AuthType auth_type) override; virtual ScreenlockBridge::LockHandler::AuthType GetAuthType( - const std::string& username) const OVERRIDE; + const std::string& username) const override; // wm::UserActivityDetector implementation: - virtual void OnUserActivity(const ui::Event* event) OVERRIDE; + virtual void OnUserActivity(const ui::Event* event) override; private: diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.h b/chrome/browser/chromeos/login/ui/webui_login_view.h index b48964d..4673fab 100644 --- a/chrome/browser/chromeos/login/ui/webui_login_view.h +++ b/chrome/browser/chromeos/login/ui/webui_login_view.h @@ -62,22 +62,22 @@ class WebUILoginView : public views::View, // Overridden from views::View: virtual bool AcceleratorPressed( - const ui::Accelerator& accelerator) OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual void RequestFocus() OVERRIDE; + const ui::Accelerator& accelerator) override; + virtual const char* GetClassName() const override; + virtual void RequestFocus() override; // Overridden from ChromeWebModalDialogManagerDelegate: virtual web_modal::WebContentsModalDialogHost* - GetWebContentsModalDialogHost() OVERRIDE; + GetWebContentsModalDialogHost() override; // Overridden from web_modal::WebContentsModalDialogHost: - virtual gfx::NativeView GetHostView() const OVERRIDE; - virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE; - virtual gfx::Size GetMaximumDialogSize() OVERRIDE; + virtual gfx::NativeView GetHostView() const override; + virtual gfx::Point GetDialogPosition(const gfx::Size& size) override; + virtual gfx::Size GetMaximumDialogSize() override; virtual void AddObserver( - web_modal::ModalDialogHostObserver* observer) OVERRIDE; + web_modal::ModalDialogHostObserver* observer) override; virtual void RemoveObserver( - web_modal::ModalDialogHostObserver* observer) OVERRIDE; + web_modal::ModalDialogHostObserver* observer) override; // Gets the native window from the view widget. gfx::NativeWindow GetNativeWindow() const; @@ -117,15 +117,15 @@ class WebUILoginView : public views::View, protected: // Overridden from views::View: - virtual void Layout() OVERRIDE; - virtual void OnLocaleChanged() OVERRIDE; - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; - virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE; + virtual void Layout() override; + virtual void OnLocaleChanged() override; + virtual void ChildPreferredSizeChanged(View* child) override; + virtual void AboutToRequestFocusFromTabTraversal(bool reverse) override; // Overridden from content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // WebView for rendering a webpage as a webui login. views::WebView* webui_login_; @@ -136,31 +136,31 @@ class WebUILoginView : public views::View, // Overridden from content::WebContentsDelegate. virtual bool HandleContextMenu( - const content::ContextMenuParams& params) OVERRIDE; + const content::ContextMenuParams& params) override; virtual void HandleKeyboardEvent( content::WebContents* source, - const content::NativeWebKeyboardEvent& event) OVERRIDE; + const content::NativeWebKeyboardEvent& event) override; virtual bool IsPopupOrPanel( - const content::WebContents* source) const OVERRIDE; - virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE; + const content::WebContents* source) const override; + virtual bool TakeFocus(content::WebContents* source, bool reverse) override; virtual void RequestMediaAccessPermission( content::WebContents* web_contents, const content::MediaStreamRequest& request, - const content::MediaResponseCallback& callback) OVERRIDE; + const content::MediaResponseCallback& callback) override; virtual bool CheckMediaAccessPermission( content::WebContents* web_contents, const GURL& security_origin, - content::MediaStreamType type) OVERRIDE; + content::MediaStreamType type) override; virtual bool PreHandleGestureEvent( content::WebContents* source, - const blink::WebGestureEvent& event) OVERRIDE; + const blink::WebGestureEvent& event) override; // Overridden from content::WebContentsObserver. virtual void DidFailProvisionalLoad( content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code, - const base::string16& error_description) OVERRIDE; + const base::string16& error_description) override; // Performs series of actions when login prompt is considered // to be ready and visible. diff --git a/chrome/browser/chromeos/login/user_flow.h b/chrome/browser/chromeos/login/user_flow.h index c487e26..0455229 100644 --- a/chrome/browser/chromeos/login/user_flow.h +++ b/chrome/browser/chromeos/login/user_flow.h @@ -50,16 +50,16 @@ class DefaultUserFlow : public UserFlow { public: virtual ~DefaultUserFlow(); - virtual bool CanLockScreen() OVERRIDE; - virtual bool ShouldShowSettings() OVERRIDE; - virtual bool ShouldLaunchBrowser() OVERRIDE; - virtual bool ShouldSkipPostLoginScreens() OVERRIDE; - virtual bool HandleLoginFailure(const AuthFailure& failure) OVERRIDE; - virtual void HandleLoginSuccess(const UserContext& context) OVERRIDE; - virtual bool HandlePasswordChangeDetected() OVERRIDE; + virtual bool CanLockScreen() override; + virtual bool ShouldShowSettings() override; + virtual bool ShouldLaunchBrowser() override; + virtual bool ShouldSkipPostLoginScreens() override; + virtual bool HandleLoginFailure(const AuthFailure& failure) override; + virtual void HandleLoginSuccess(const UserContext& context) override; + virtual bool HandlePasswordChangeDetected() override; virtual void HandleOAuthTokenStatusChange( - user_manager::User::OAuthTokenStatus status) OVERRIDE; - virtual void LaunchExtraSteps(Profile* profile) OVERRIDE; + user_manager::User::OAuthTokenStatus status) override; + virtual void LaunchExtraSteps(Profile* profile) override; }; // UserFlow stub for non-regular flows. @@ -68,7 +68,7 @@ class ExtendedUserFlow : public UserFlow { explicit ExtendedUserFlow(const std::string& user_id); virtual ~ExtendedUserFlow(); - virtual bool ShouldShowSettings() OVERRIDE; + virtual bool ShouldShowSettings() override; protected: // Subclasses can call this method to unregister flow in the next event. diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_loader.h b/chrome/browser/chromeos/login/users/avatar/user_image_loader.h index 3f72f89..ed586cd 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_loader.h +++ b/chrome/browser/chromeos/login/users/avatar/user_image_loader.h @@ -83,8 +83,8 @@ class UserImageLoader : public base::RefCountedThreadSafe<UserImageLoader>, // ImageDecoder::Delegate implementation. These callbacks will only be invoked // via the |background_task_runner_|. virtual void OnImageDecoded(const ImageDecoder* decoder, - const SkBitmap& decoded_image) OVERRIDE; - virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE; + const SkBitmap& decoded_image) override; + virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override; // The foreground task runner on which |this| is instantiated, Start() is // called and LoadedCallbacks are invoked. diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc index 2a77809..d4f0e7b 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc +++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc @@ -103,27 +103,27 @@ class UserImageManagerTest : public LoginManagerTest, } // LoginManagerTest overrides: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { LoginManagerTest::SetUpInProcessBrowserTestFixture(); ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_)); ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_)); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { LoginManagerTest::SetUpOnMainThread(); local_state_ = g_browser_process->local_state(); user_manager::UserManager::Get()->AddObserver(this); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { user_manager::UserManager::Get()->RemoveObserver(this); LoginManagerTest::TearDownOnMainThread(); } // UserManager::Observer overrides: virtual void LocalStateChanged( - user_manager::UserManager* user_manager) OVERRIDE { + user_manager::UserManager* user_manager) override { if (run_loop_) run_loop_->Quit(); } @@ -604,13 +604,13 @@ class UserImageManagerPolicyTest : public UserImageManagerTest, } // UserImageManagerTest overrides: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); UserImageManagerTest::SetUpInProcessBrowserTestFixture(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { UserImageManagerTest::SetUpOnMainThread(); base::FilePath user_keys_dir; @@ -639,12 +639,12 @@ class UserImageManagerPolicyTest : public UserImageManagerTest, } // policy::CloudPolicyStore::Observer overrides: - virtual void OnStoreLoaded(policy::CloudPolicyStore* store) OVERRIDE { + virtual void OnStoreLoaded(policy::CloudPolicyStore* store) override { if (run_loop_) run_loop_->Quit(); } - virtual void OnStoreError(policy::CloudPolicyStore* store) OVERRIDE { + virtual void OnStoreError(policy::CloudPolicyStore* store) override { if (run_loop_) run_loop_->Quit(); } diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h index 7390374..03ffc8f 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h +++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h @@ -48,23 +48,23 @@ class UserImageManagerImpl user_manager::UserManager* user_manager); virtual ~UserImageManagerImpl(); - virtual void LoadUserImage() OVERRIDE; - virtual void UserLoggedIn(bool user_is_new, bool user_is_local) OVERRIDE; - virtual void SaveUserDefaultImageIndex(int default_image_index) OVERRIDE; + virtual void LoadUserImage() override; + virtual void UserLoggedIn(bool user_is_new, bool user_is_local) override; + virtual void SaveUserDefaultImageIndex(int default_image_index) override; virtual void SaveUserImage( - const user_manager::UserImage& user_image) OVERRIDE; - virtual void SaveUserImageFromFile(const base::FilePath& path) OVERRIDE; - virtual void SaveUserImageFromProfileImage() OVERRIDE; - virtual void DeleteUserImage() OVERRIDE; - virtual void DownloadProfileImage(const std::string& reason) OVERRIDE; - virtual const gfx::ImageSkia& DownloadedProfileImage() const OVERRIDE; - virtual UserImageSyncObserver* GetSyncObserver() const OVERRIDE; - virtual void Shutdown() OVERRIDE; - - virtual void OnExternalDataSet(const std::string& policy) OVERRIDE; - virtual void OnExternalDataCleared(const std::string& policy) OVERRIDE; + const user_manager::UserImage& user_image) override; + virtual void SaveUserImageFromFile(const base::FilePath& path) override; + virtual void SaveUserImageFromProfileImage() override; + virtual void DeleteUserImage() override; + virtual void DownloadProfileImage(const std::string& reason) override; + virtual const gfx::ImageSkia& DownloadedProfileImage() const override; + virtual UserImageSyncObserver* GetSyncObserver() const override; + virtual void Shutdown() override; + + virtual void OnExternalDataSet(const std::string& policy) override; + virtual void OnExternalDataCleared(const std::string& policy) override; virtual void OnExternalDataFetched(const std::string& policy, - scoped_ptr<std::string> data) OVERRIDE; + scoped_ptr<std::string> data) override; static void IgnoreProfileDataDownloadDelayForTesting(); @@ -85,14 +85,14 @@ class UserImageManagerImpl class Job; // ProfileDownloaderDelegate: - virtual bool NeedsProfilePicture() const OVERRIDE; - virtual int GetDesiredImageSideLength() const OVERRIDE; - virtual Profile* GetBrowserProfile() OVERRIDE; - virtual std::string GetCachedPictureURL() const OVERRIDE; - virtual void OnProfileDownloadSuccess(ProfileDownloader* downloader) OVERRIDE; + virtual bool NeedsProfilePicture() const override; + virtual int GetDesiredImageSideLength() const override; + virtual Profile* GetBrowserProfile() override; + virtual std::string GetCachedPictureURL() const override; + virtual void OnProfileDownloadSuccess(ProfileDownloader* downloader) override; virtual void OnProfileDownloadFailure( ProfileDownloader* downloader, - ProfileDownloaderDelegate::FailureReason reason) OVERRIDE; + ProfileDownloaderDelegate::FailureReason reason) override; // Returns true if the user image for the user is managed by // policy and the user is not allowed to change it. diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h b/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h index 420de02..fe4e782 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h +++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h @@ -40,8 +40,8 @@ class ImageLoader : public ImageDecoder::Delegate { // ImageDecoder::Delegate: virtual void OnImageDecoded(const ImageDecoder* decoder, - const SkBitmap& decoded_image) OVERRIDE; - virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE; + const SkBitmap& decoded_image) override; + virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override; private: base::FilePath path_; diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h index a4c82ca..c289993 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h +++ b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h @@ -60,12 +60,12 @@ class UserImageSyncObserver: public PrefServiceSyncableObserver, private: // PrefServiceSyncableObserver implementation. - virtual void OnIsSyncingChanged() OVERRIDE; + virtual void OnIsSyncingChanged() override; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Called after user profile was loaded. void OnProfileGained(Profile* profile); diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h index 102a43d..397f4da 100644 --- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h +++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h @@ -65,84 +65,84 @@ class ChromeUserManagerImpl static void RegisterPrefs(PrefRegistrySimple* registry); // ChromeUserManager implementation: - virtual MultiProfileUserController* GetMultiProfileUserController() OVERRIDE; + virtual MultiProfileUserController* GetMultiProfileUserController() override; virtual UserImageManager* GetUserImageManager( - const std::string& user_id) OVERRIDE; - virtual SupervisedUserManager* GetSupervisedUserManager() OVERRIDE; - virtual UserFlow* GetCurrentUserFlow() const OVERRIDE; - virtual UserFlow* GetUserFlow(const std::string& user_id) const OVERRIDE; - virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) OVERRIDE; - virtual void ResetUserFlow(const std::string& user_id) OVERRIDE; + const std::string& user_id) override; + virtual SupervisedUserManager* GetSupervisedUserManager() override; + virtual UserFlow* GetCurrentUserFlow() const override; + virtual UserFlow* GetUserFlow(const std::string& user_id) const override; + virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) override; + virtual void ResetUserFlow(const std::string& user_id) override; // UserManager implementation: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; virtual user_manager::UserList GetUsersAllowedForMultiProfile() - const OVERRIDE; - virtual user_manager::UserList GetUnlockUsers() const OVERRIDE; - virtual void SessionStarted() OVERRIDE; + const override; + virtual user_manager::UserList GetUnlockUsers() const override; + virtual void SessionStarted() override; virtual void SaveUserOAuthStatus( const std::string& user_id, - user_manager::User::OAuthTokenStatus oauth_token_status) OVERRIDE; + user_manager::User::OAuthTokenStatus oauth_token_status) override; virtual void SaveUserDisplayName(const std::string& user_id, - const base::string16& display_name) OVERRIDE; - virtual bool CanCurrentUserLock() const OVERRIDE; + const base::string16& display_name) override; + virtual bool CanCurrentUserLock() const override; virtual bool IsUserNonCryptohomeDataEphemeral( - const std::string& user_id) const OVERRIDE; - virtual bool AreSupervisedUsersAllowed() const OVERRIDE; + const std::string& user_id) const override; + virtual bool AreSupervisedUsersAllowed() const override; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // policy::CloudExternalDataPolicyObserver::Delegate: virtual void OnExternalDataSet(const std::string& policy, - const std::string& user_id) OVERRIDE; + const std::string& user_id) override; virtual void OnExternalDataCleared(const std::string& policy, - const std::string& user_id) OVERRIDE; + const std::string& user_id) override; virtual void OnExternalDataFetched(const std::string& policy, const std::string& user_id, - scoped_ptr<std::string> data) OVERRIDE; + scoped_ptr<std::string> data) override; // policy::DeviceLocalAccountPolicyService::Observer implementation. - virtual void OnPolicyUpdated(const std::string& user_id) OVERRIDE; - virtual void OnDeviceLocalAccountsChanged() OVERRIDE; + virtual void OnPolicyUpdated(const std::string& user_id) override; + virtual void OnDeviceLocalAccountsChanged() override; void StopPolicyObserverForTesting(); protected: // UserManagerBase implementation: - virtual bool AreEphemeralUsersEnabled() const OVERRIDE; - virtual const std::string& GetApplicationLocale() const OVERRIDE; - virtual PrefService* GetLocalState() const OVERRIDE; + virtual bool AreEphemeralUsersEnabled() const override; + virtual const std::string& GetApplicationLocale() const override; + virtual PrefService* GetLocalState() const override; virtual void HandleUserOAuthTokenStatusChange( const std::string& user_id, - user_manager::User::OAuthTokenStatus status) const OVERRIDE; - virtual bool IsEnterpriseManaged() const OVERRIDE; - virtual void LoadPublicAccounts(std::set<std::string>* users_set) OVERRIDE; - virtual void NotifyOnLogin() OVERRIDE; + user_manager::User::OAuthTokenStatus status) const override; + virtual bool IsEnterpriseManaged() const override; + virtual void LoadPublicAccounts(std::set<std::string>* users_set) override; + virtual void NotifyOnLogin() override; virtual void NotifyUserAddedToSession(const user_manager::User* added_user, - bool user_switch_pending) OVERRIDE; - virtual void PerformPreUserListLoadingActions() OVERRIDE; - virtual void PerformPostUserListLoadingActions() OVERRIDE; - virtual void PerformPostUserLoggedInActions(bool browser_restart) OVERRIDE; - virtual void RemoveNonCryptohomeData(const std::string& user_id) OVERRIDE; + bool user_switch_pending) override; + virtual void PerformPreUserListLoadingActions() override; + virtual void PerformPostUserListLoadingActions() override; + virtual void PerformPostUserLoggedInActions(bool browser_restart) override; + virtual void RemoveNonCryptohomeData(const std::string& user_id) override; virtual void RemoveUserInternal( const std::string& user_email, - user_manager::RemoveUserDelegate* delegate) OVERRIDE; - virtual bool IsDemoApp(const std::string& user_id) const OVERRIDE; - virtual bool IsKioskApp(const std::string& user_id) const OVERRIDE; + user_manager::RemoveUserDelegate* delegate) override; + virtual bool IsDemoApp(const std::string& user_id) const override; + virtual bool IsKioskApp(const std::string& user_id) const override; virtual bool IsPublicAccountMarkedForRemoval( - const std::string& user_id) const OVERRIDE; - virtual void DemoAccountLoggedIn() OVERRIDE; - virtual void GuestUserLoggedIn() OVERRIDE; - virtual void KioskAppLoggedIn(const std::string& app_id) OVERRIDE; - virtual void PublicAccountUserLoggedIn(user_manager::User* user) OVERRIDE; - virtual void RegularUserLoggedIn(const std::string& user_id) OVERRIDE; + const std::string& user_id) const override; + virtual void DemoAccountLoggedIn() override; + virtual void GuestUserLoggedIn() override; + virtual void KioskAppLoggedIn(const std::string& app_id) override; + virtual void PublicAccountUserLoggedIn(user_manager::User* user) override; + virtual void RegularUserLoggedIn(const std::string& user_id) override; virtual void RegularUserLoggedInAsEphemeral( - const std::string& user_id) OVERRIDE; - virtual void RetailModeUserLoggedIn() OVERRIDE; - virtual void SupervisedUserLoggedIn(const std::string& user_id) OVERRIDE; + const std::string& user_id) override; + virtual void RetailModeUserLoggedIn() override; + virtual void SupervisedUserLoggedIn(const std::string& user_id) override; private: friend class SupervisedUserManagerImpl; @@ -193,7 +193,7 @@ class ChromeUserManagerImpl UserFlow* GetDefaultUserFlow() const; // MultiProfileUserControllerDelegate implementation: - virtual void OnUserNotAllowed(const std::string& user_email) OVERRIDE; + virtual void OnUserNotAllowed(const std::string& user_email) override; // Update the number of users. void UpdateNumberOfUsers(); diff --git a/chrome/browser/chromeos/login/users/fake_supervised_user_manager.h b/chrome/browser/chromeos/login/users/fake_supervised_user_manager.h index e913ad5..a3ad6be 100644 --- a/chrome/browser/chromeos/login/users/fake_supervised_user_manager.h +++ b/chrome/browser/chromeos/login/users/fake_supervised_user_manager.h @@ -17,42 +17,42 @@ class FakeSupervisedUserManager : public SupervisedUserManager { FakeSupervisedUserManager(); virtual ~FakeSupervisedUserManager(); - virtual bool HasSupervisedUsers(const std::string& manager_id) const OVERRIDE; + virtual bool HasSupervisedUsers(const std::string& manager_id) const override; virtual const user_manager::User* CreateUserRecord( const std::string& manager_id, const std::string& local_user_id, const std::string& sync_user_id, - const base::string16& display_name) OVERRIDE; - virtual std::string GenerateUserId() OVERRIDE; + const base::string16& display_name) override; + virtual std::string GenerateUserId() override; virtual const user_manager::User* FindByDisplayName( - const base::string16& display_name) const OVERRIDE; + const base::string16& display_name) const override; virtual const user_manager::User* FindBySyncId( - const std::string& sync_id) const OVERRIDE; - virtual std::string GetUserSyncId(const std::string& user_id) const OVERRIDE; + const std::string& sync_id) const override; + virtual std::string GetUserSyncId(const std::string& user_id) const override; virtual base::string16 GetManagerDisplayName(const std::string& user_id) const - OVERRIDE; + override; virtual std::string GetManagerUserId(const std::string& user_id) const - OVERRIDE; + override; virtual std::string GetManagerDisplayEmail(const std::string& user_id) const - OVERRIDE; + override; virtual void StartCreationTransaction(const base::string16& display_name) - OVERRIDE {} + override {} virtual void SetCreationTransactionUserId(const std::string& user_id) - OVERRIDE {} - virtual void CommitCreationTransaction() OVERRIDE {} - virtual SupervisedUserAuthentication* GetAuthentication() OVERRIDE; + override {} + virtual void CommitCreationTransaction() override {} + virtual SupervisedUserAuthentication* GetAuthentication() override; virtual void GetPasswordInformation( const std::string& user_id, - base::DictionaryValue* result) OVERRIDE {} + base::DictionaryValue* result) override {} virtual void SetPasswordInformation( const std::string& user_id, - const base::DictionaryValue* password_info) OVERRIDE {} + const base::DictionaryValue* password_info) override {} virtual void LoadSupervisedUserToken( Profile * profile, - const LoadTokenCallback& callback) OVERRIDE; + const LoadTokenCallback& callback) override; virtual void ConfigureSyncWithToken( Profile* profile, - const std::string& token) OVERRIDE {} + const std::string& token) override {} private: DISALLOW_COPY_AND_ASSIGN(FakeSupervisedUserManager); diff --git a/chrome/browser/chromeos/login/users/fake_user_manager.cc b/chrome/browser/chromeos/login/users/fake_user_manager.cc index 6cd3841..4ebad74 100644 --- a/chrome/browser/chromeos/login/users/fake_user_manager.cc +++ b/chrome/browser/chromeos/login/users/fake_user_manager.cc @@ -18,11 +18,11 @@ class FakeTaskRunner : public base::TaskRunner { public: virtual bool PostDelayedTask(const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE { + base::TimeDelta delay) override { task.Run(); return true; } - virtual bool RunsTasksOnCurrentThread() const OVERRIDE { return true; } + virtual bool RunsTasksOnCurrentThread() const override { return true; } protected: virtual ~FakeTaskRunner() {} diff --git a/chrome/browser/chromeos/login/users/fake_user_manager.h b/chrome/browser/chromeos/login/users/fake_user_manager.h index 5425438..05665b9 100644 --- a/chrome/browser/chromeos/login/users/fake_user_manager.h +++ b/chrome/browser/chromeos/login/users/fake_user_manager.h @@ -38,110 +38,110 @@ class FakeUserManager : public ChromeUserManager { void LoginUser(const std::string& email); // ChromeUserManager overrides. - virtual MultiProfileUserController* GetMultiProfileUserController() OVERRIDE; + virtual MultiProfileUserController* GetMultiProfileUserController() override; virtual UserImageManager* GetUserImageManager( - const std::string& user_id) OVERRIDE; - virtual SupervisedUserManager* GetSupervisedUserManager() OVERRIDE; - virtual void SetUserFlow(const std::string& email, UserFlow* flow) OVERRIDE {} - virtual UserFlow* GetCurrentUserFlow() const OVERRIDE; - virtual UserFlow* GetUserFlow(const std::string& email) const OVERRIDE; - virtual void ResetUserFlow(const std::string& email) OVERRIDE {} + const std::string& user_id) override; + virtual SupervisedUserManager* GetSupervisedUserManager() override; + virtual void SetUserFlow(const std::string& email, UserFlow* flow) override {} + virtual UserFlow* GetCurrentUserFlow() const override; + virtual UserFlow* GetUserFlow(const std::string& email) const override; + virtual void ResetUserFlow(const std::string& email) override {} // UserManager overrides. - virtual const user_manager::UserList& GetUsers() const OVERRIDE; + virtual const user_manager::UserList& GetUsers() const override; virtual user_manager::UserList GetUsersAllowedForMultiProfile() - const OVERRIDE; - virtual const user_manager::UserList& GetLoggedInUsers() const OVERRIDE; + const override; + virtual const user_manager::UserList& GetLoggedInUsers() const override; // Set the user as logged in. virtual void UserLoggedIn(const std::string& email, const std::string& username_hash, - bool browser_restart) OVERRIDE; + bool browser_restart) override; - virtual const user_manager::User* GetActiveUser() const OVERRIDE; - virtual user_manager::User* GetActiveUser() OVERRIDE; - virtual void SwitchActiveUser(const std::string& email) OVERRIDE; + virtual const user_manager::User* GetActiveUser() const override; + virtual user_manager::User* GetActiveUser() override; + virtual void SwitchActiveUser(const std::string& email) override; virtual void SaveUserDisplayName(const std::string& username, - const base::string16& display_name) OVERRIDE; + const base::string16& display_name) override; // Not implemented. virtual void UpdateUserAccountData( const std::string& user_id, - const UserAccountData& account_data) OVERRIDE {} - virtual void Shutdown() OVERRIDE {} - virtual const user_manager::UserList& GetLRULoggedInUsers() const OVERRIDE; - virtual user_manager::UserList GetUnlockUsers() const OVERRIDE; - virtual const std::string& GetOwnerEmail() const OVERRIDE; - virtual void SessionStarted() OVERRIDE {} + const UserAccountData& account_data) override {} + virtual void Shutdown() override {} + virtual const user_manager::UserList& GetLRULoggedInUsers() const override; + virtual user_manager::UserList GetUnlockUsers() const override; + virtual const std::string& GetOwnerEmail() const override; + virtual void SessionStarted() override {} virtual void RemoveUser(const std::string& email, - user_manager::RemoveUserDelegate* delegate) OVERRIDE { + user_manager::RemoveUserDelegate* delegate) override { } - virtual void RemoveUserFromList(const std::string& email) OVERRIDE; - virtual bool IsKnownUser(const std::string& email) const OVERRIDE; + virtual void RemoveUserFromList(const std::string& email) override; + virtual bool IsKnownUser(const std::string& email) const override; virtual const user_manager::User* FindUser( - const std::string& email) const OVERRIDE; + const std::string& email) const override; virtual user_manager::User* FindUserAndModify( - const std::string& email) OVERRIDE; - virtual const user_manager::User* GetLoggedInUser() const OVERRIDE; - virtual user_manager::User* GetLoggedInUser() OVERRIDE; - virtual const user_manager::User* GetPrimaryUser() const OVERRIDE; + const std::string& email) override; + virtual const user_manager::User* GetLoggedInUser() const override; + virtual user_manager::User* GetLoggedInUser() override; + virtual const user_manager::User* GetPrimaryUser() const override; virtual void SaveUserOAuthStatus( const std::string& username, - user_manager::User::OAuthTokenStatus oauth_token_status) OVERRIDE {} + user_manager::User::OAuthTokenStatus oauth_token_status) override {} virtual void SaveForceOnlineSignin(const std::string& user_id, - bool force_online_signin) OVERRIDE {} + bool force_online_signin) override {} virtual base::string16 GetUserDisplayName( - const std::string& username) const OVERRIDE; + const std::string& username) const override; virtual void SaveUserDisplayEmail(const std::string& username, - const std::string& display_email) OVERRIDE {} + const std::string& display_email) override {} virtual std::string GetUserDisplayEmail( - const std::string& username) const OVERRIDE; - virtual bool IsCurrentUserOwner() const OVERRIDE; - virtual bool IsCurrentUserNew() const OVERRIDE; - virtual bool IsCurrentUserNonCryptohomeDataEphemeral() const OVERRIDE; - virtual bool CanCurrentUserLock() const OVERRIDE; - virtual bool IsUserLoggedIn() const OVERRIDE; - virtual bool IsLoggedInAsRegularUser() const OVERRIDE; - virtual bool IsLoggedInAsDemoUser() const OVERRIDE; - virtual bool IsLoggedInAsPublicAccount() const OVERRIDE; - virtual bool IsLoggedInAsGuest() const OVERRIDE; - virtual bool IsLoggedInAsSupervisedUser() const OVERRIDE; - virtual bool IsLoggedInAsKioskApp() const OVERRIDE; - virtual bool IsLoggedInAsStub() const OVERRIDE; - virtual bool IsSessionStarted() const OVERRIDE; + const std::string& username) const override; + virtual bool IsCurrentUserOwner() const override; + virtual bool IsCurrentUserNew() const override; + virtual bool IsCurrentUserNonCryptohomeDataEphemeral() const override; + virtual bool CanCurrentUserLock() const override; + virtual bool IsUserLoggedIn() const override; + virtual bool IsLoggedInAsRegularUser() const override; + virtual bool IsLoggedInAsDemoUser() const override; + virtual bool IsLoggedInAsPublicAccount() const override; + virtual bool IsLoggedInAsGuest() const override; + virtual bool IsLoggedInAsSupervisedUser() const override; + virtual bool IsLoggedInAsKioskApp() const override; + virtual bool IsLoggedInAsStub() const override; + virtual bool IsSessionStarted() const override; virtual bool IsUserNonCryptohomeDataEphemeral( - const std::string& email) const OVERRIDE; - virtual void AddObserver(Observer* obs) OVERRIDE {} - virtual void RemoveObserver(Observer* obs) OVERRIDE {} + const std::string& email) const override; + virtual void AddObserver(Observer* obs) override {} + virtual void RemoveObserver(Observer* obs) override {} virtual void AddSessionStateObserver( - UserSessionStateObserver* obs) OVERRIDE {} + UserSessionStateObserver* obs) override {} virtual void RemoveSessionStateObserver( - UserSessionStateObserver* obs) OVERRIDE {} - virtual void NotifyLocalStateChanged() OVERRIDE {} - virtual bool AreSupervisedUsersAllowed() const OVERRIDE; + UserSessionStateObserver* obs) override {} + virtual void NotifyLocalStateChanged() override {} + virtual bool AreSupervisedUsersAllowed() const override; // UserManagerBase overrides: - virtual bool AreEphemeralUsersEnabled() const OVERRIDE; - virtual const std::string& GetApplicationLocale() const OVERRIDE; - virtual PrefService* GetLocalState() const OVERRIDE; + virtual bool AreEphemeralUsersEnabled() const override; + virtual const std::string& GetApplicationLocale() const override; + virtual PrefService* GetLocalState() const override; virtual void HandleUserOAuthTokenStatusChange( const std::string& user_id, - user_manager::User::OAuthTokenStatus status) const OVERRIDE {} - virtual bool IsEnterpriseManaged() const OVERRIDE; + user_manager::User::OAuthTokenStatus status) const override {} + virtual bool IsEnterpriseManaged() const override; virtual void LoadPublicAccounts( - std::set<std::string>* public_sessions_set) OVERRIDE {} - virtual void PerformPreUserListLoadingActions() OVERRIDE {} - virtual void PerformPostUserListLoadingActions() OVERRIDE {} - virtual void PerformPostUserLoggedInActions(bool browser_restart) OVERRIDE {} - virtual bool IsDemoApp(const std::string& user_id) const OVERRIDE; - virtual bool IsKioskApp(const std::string& user_id) const OVERRIDE; + std::set<std::string>* public_sessions_set) override {} + virtual void PerformPreUserListLoadingActions() override {} + virtual void PerformPostUserListLoadingActions() override {} + virtual void PerformPostUserLoggedInActions(bool browser_restart) override {} + virtual bool IsDemoApp(const std::string& user_id) const override; + virtual bool IsKioskApp(const std::string& user_id) const override; virtual bool IsPublicAccountMarkedForRemoval( - const std::string& user_id) const OVERRIDE; - virtual void DemoAccountLoggedIn() OVERRIDE {} - virtual void KioskAppLoggedIn(const std::string& app_id) OVERRIDE {} - virtual void PublicAccountUserLoggedIn(user_manager::User* user) OVERRIDE {} - virtual void RetailModeUserLoggedIn() OVERRIDE {} - virtual void SupervisedUserLoggedIn(const std::string& user_id) OVERRIDE {} + const std::string& user_id) const override; + virtual void DemoAccountLoggedIn() override {} + virtual void KioskAppLoggedIn(const std::string& app_id) override {} + virtual void PublicAccountUserLoggedIn(user_manager::User* user) override {} + virtual void RetailModeUserLoggedIn() override {} + virtual void SupervisedUserLoggedIn(const std::string& user_id) override {} void set_owner_email(const std::string& owner_email) { owner_email_ = owner_email; diff --git a/chrome/browser/chromeos/login/users/mock_user_manager.cc b/chrome/browser/chromeos/login/users/mock_user_manager.cc index b459256..5a00c44 100644 --- a/chrome/browser/chromeos/login/users/mock_user_manager.cc +++ b/chrome/browser/chromeos/login/users/mock_user_manager.cc @@ -14,11 +14,11 @@ class FakeTaskRunner : public base::TaskRunner { public: virtual bool PostDelayedTask(const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE { + base::TimeDelta delay) override { task.Run(); return true; } - virtual bool RunsTasksOnCurrentThread() const OVERRIDE { return true; } + virtual bool RunsTasksOnCurrentThread() const override { return true; } protected: virtual ~FakeTaskRunner() {} diff --git a/chrome/browser/chromeos/login/users/mock_user_manager.h b/chrome/browser/chromeos/login/users/mock_user_manager.h index 6f96e00..63ee5f4 100644 --- a/chrome/browser/chromeos/login/users/mock_user_manager.h +++ b/chrome/browser/chromeos/login/users/mock_user_manager.h @@ -98,24 +98,24 @@ class MockUserManager : public ChromeUserManager { // You can't mock these functions easily because nobody can create // User objects but the ChromeUserManager and us. - virtual const user_manager::UserList& GetUsers() const OVERRIDE; - virtual const user_manager::User* GetLoggedInUser() const OVERRIDE; - virtual user_manager::UserList GetUnlockUsers() const OVERRIDE; - virtual const std::string& GetOwnerEmail() const OVERRIDE; - virtual user_manager::User* GetLoggedInUser() OVERRIDE; - virtual const user_manager::User* GetActiveUser() const OVERRIDE; - virtual user_manager::User* GetActiveUser() OVERRIDE; - virtual const user_manager::User* GetPrimaryUser() const OVERRIDE; + virtual const user_manager::UserList& GetUsers() const override; + virtual const user_manager::User* GetLoggedInUser() const override; + virtual user_manager::UserList GetUnlockUsers() const override; + virtual const std::string& GetOwnerEmail() const override; + virtual user_manager::User* GetLoggedInUser() override; + virtual const user_manager::User* GetActiveUser() const override; + virtual user_manager::User* GetActiveUser() override; + virtual const user_manager::User* GetPrimaryUser() const override; // ChromeUserManager overrides: - virtual MultiProfileUserController* GetMultiProfileUserController() OVERRIDE; + virtual MultiProfileUserController* GetMultiProfileUserController() override; virtual UserImageManager* GetUserImageManager( - const std::string& user_id) OVERRIDE; - virtual SupervisedUserManager* GetSupervisedUserManager() OVERRIDE; + const std::string& user_id) override; + virtual SupervisedUserManager* GetSupervisedUserManager() override; MOCK_METHOD2(SetUserFlow, void(const std::string&, UserFlow*)); MOCK_METHOD1(ResetUserFlow, void(const std::string&)); - virtual UserFlow* GetCurrentUserFlow() const OVERRIDE; - virtual UserFlow* GetUserFlow(const std::string&) const OVERRIDE; + virtual UserFlow* GetCurrentUserFlow() const override; + virtual UserFlow* GetUserFlow(const std::string&) const override; // Sets a new User instance. Users previously created by this MockUserManager // become invalid. diff --git a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc index 7bf7b94..1199e03 100644 --- a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc +++ b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc @@ -119,7 +119,7 @@ class MultiProfileUserControllerTest user_not_allowed_count_(0) {} virtual ~MultiProfileUserControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { profile_manager_.reset( new TestingProfileManager(TestingBrowserProcess::GetGlobal())); ASSERT_TRUE(profile_manager_->SetUp()); @@ -141,7 +141,7 @@ class MultiProfileUserControllerTest } } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Clear our cached pointer to the PolicyCertVerifier. g_policy_cert_verifier_for_factory = NULL; @@ -189,7 +189,7 @@ class MultiProfileUserControllerTest } // MultiProfileUserControllerDeleagte overrides: - virtual void OnUserNotAllowed(const std::string& user_email) OVERRIDE { + virtual void OnUserNotAllowed(const std::string& user_email) override { ++user_not_allowed_count_; } diff --git a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h index eaa013f..255c40b 100644 --- a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h +++ b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h @@ -23,41 +23,41 @@ class SupervisedUserManagerImpl public: virtual ~SupervisedUserManagerImpl(); - virtual bool HasSupervisedUsers(const std::string& manager_id) const OVERRIDE; + virtual bool HasSupervisedUsers(const std::string& manager_id) const override; virtual const user_manager::User* CreateUserRecord( const std::string& manager_id, const std::string& local_user_id, const std::string& sync_user_id, - const base::string16& display_name) OVERRIDE; - virtual std::string GenerateUserId() OVERRIDE; + const base::string16& display_name) override; + virtual std::string GenerateUserId() override; virtual const user_manager::User* FindByDisplayName( - const base::string16& display_name) const OVERRIDE; + const base::string16& display_name) const override; virtual const user_manager::User* FindBySyncId( - const std::string& sync_id) const OVERRIDE; - virtual std::string GetUserSyncId(const std::string& user_id) const OVERRIDE; + const std::string& sync_id) const override; + virtual std::string GetUserSyncId(const std::string& user_id) const override; virtual base::string16 GetManagerDisplayName(const std::string& user_id) const - OVERRIDE; + override; virtual std::string GetManagerUserId(const std::string& user_id) const - OVERRIDE; + override; virtual std::string GetManagerDisplayEmail(const std::string& user_id) const - OVERRIDE; + override; virtual void StartCreationTransaction(const base::string16& display_name) - OVERRIDE; + override; virtual void SetCreationTransactionUserId(const std::string& user_id) - OVERRIDE; - virtual void CommitCreationTransaction() OVERRIDE; - virtual SupervisedUserAuthentication* GetAuthentication() OVERRIDE; + override; + virtual void CommitCreationTransaction() override; + virtual SupervisedUserAuthentication* GetAuthentication() override; virtual void GetPasswordInformation(const std::string& user_id, - base::DictionaryValue* result) OVERRIDE; + base::DictionaryValue* result) override; virtual void SetPasswordInformation( const std::string& user_id, - const base::DictionaryValue* password_info) OVERRIDE; + const base::DictionaryValue* password_info) override; virtual void LoadSupervisedUserToken( Profile * profile, - const LoadTokenCallback& callback) OVERRIDE; + const LoadTokenCallback& callback) override; virtual void ConfigureSyncWithToken( Profile* profile, - const std::string& token) OVERRIDE; + const std::string& token) override; private: friend class ChromeUserManagerImpl; diff --git a/chrome/browser/chromeos/login/users/user_manager_unittest.cc b/chrome/browser/chromeos/login/users/user_manager_unittest.cc index 7c448a4..6ba4944 100644 --- a/chrome/browser/chromeos/login/users/user_manager_unittest.cc +++ b/chrome/browser/chromeos/login/users/user_manager_unittest.cc @@ -40,7 +40,7 @@ class UnittestProfileManager : public ::ProfileManagerWithoutInit { protected: virtual Profile* CreateProfileHelper( - const base::FilePath& file_path) OVERRIDE { + const base::FilePath& file_path) override { if (!base::PathExists(file_path)) { if (!base::CreateDirectory(file_path)) return NULL; @@ -52,7 +52,7 @@ class UnittestProfileManager : public ::ProfileManagerWithoutInit { class UserManagerTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CommandLine& command_line = *CommandLine::ForCurrentProcess(); command_line.AppendSwitch(::switches::kTestType); command_line.AppendSwitch( @@ -84,7 +84,7 @@ class UserManagerTest : public testing::Test { ResetUserManager(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Unregister the in-memory local settings instance. local_state_.reset(); diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h index b76e305..3780888 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h @@ -258,7 +258,7 @@ class WallpaperManager: public content::NotificationObserver { // NotificationObserver overrides: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Removes all |user_id| related wallpaper info and saved wallpapers. void RemoveUserWallpaperInfo(const std::string& user_id); diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc index 35887e7..ed33cff 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc @@ -64,7 +64,7 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest { virtual ~WallpaperManagerBrowserTest () {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { controller_ = ash::Shell::GetInstance()->desktop_background_controller(); local_state_ = g_browser_process->local_state(); DesktopBackgroundController::TestAPI(controller_) @@ -72,12 +72,12 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest { UpdateDisplay("800x600"); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kLoginManager); command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { controller_ = NULL; } @@ -349,7 +349,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, class WallpaperManagerBrowserTestNoAnimation : public WallpaperManagerBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kLoginManager); command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); command_line->AppendSwitch(chromeos::switches::kDisableLoginAnimations); @@ -412,7 +412,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation, class WallpaperManagerBrowserTestCrashRestore : public WallpaperManagerBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kDisableLoginAnimations); command_line->AppendSwitch(chromeos::switches::kDisableBootAnimation); command_line->AppendSwitchASCII(switches::kLoginUser, kTestUser1); @@ -436,7 +436,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCrashRestore, class WallpaperManagerBrowserTestCacheUpdate : public WallpaperManagerBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII(switches::kLoginUser, kTestUser1); command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); } @@ -567,10 +567,10 @@ class TestObserver : public WallpaperManager::Observer { wallpaper_manager_->RemoveObserver(this); } - virtual void OnWallpaperAnimationFinished(const std::string&) OVERRIDE { + virtual void OnWallpaperAnimationFinished(const std::string&) override { } - virtual void OnUpdateWallpaperForTesting() OVERRIDE { + virtual void OnUpdateWallpaperForTesting() override { ++update_wallpaper_count_; } diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc index 0e89f4b..fe3a640 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc @@ -163,7 +163,7 @@ class WallpaperManagerPolicyTest } // LoginManagerTest: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); @@ -171,7 +171,7 @@ class WallpaperManagerPolicyTest ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_)); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Set the same switches as LoginManagerTest, except that kMultiProfiles is // only set when GetParam() is true and except that kLoginProfile is set // when GetParam() is false. The latter seems to be required for the sane @@ -180,7 +180,7 @@ class WallpaperManagerPolicyTest command_line->AppendSwitch(switches::kForceLoginManagerInTests); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { LoginManagerTest::SetUpOnMainThread(); ash::Shell::GetInstance()-> desktop_background_controller()->AddObserver(this); @@ -192,14 +192,14 @@ class WallpaperManagerPolicyTest ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { ash::Shell::GetInstance()-> desktop_background_controller()->RemoveObserver(this); LoginManagerTest::TearDownOnMainThread(); } // ash::DesktopBackgroundControllerObserver: - virtual void OnWallpaperDataChanged() OVERRIDE { + virtual void OnWallpaperDataChanged() override { ++wallpaper_change_count_; if (run_loop_) run_loop_->Quit(); diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc index b70e146..e4f4f84 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc @@ -37,9 +37,9 @@ class TestWallpaperObserverPendingListEmpty } virtual void OnWallpaperAnimationFinished( - const std::string& user_id) OVERRIDE {} + const std::string& user_id) override {} - virtual void OnPendingListEmptyForTesting() OVERRIDE { + virtual void OnPendingListEmptyForTesting() override { empty_ = true; base::MessageLoop::current()->Quit(); } diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc index 8bed97f..b0a737e 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc @@ -48,7 +48,7 @@ class WallpaperManagerCacheTest : public test::AshTestBase { FakeUserManager* fake_user_manager() { return fake_user_manager_; } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); } diff --git a/chrome/browser/chromeos/login/version_info_updater.h b/chrome/browser/chromeos/login/version_info_updater.h index fb74fa7..87d3c78 100644 --- a/chrome/browser/chromeos/login/version_info_updater.h +++ b/chrome/browser/chromeos/login/version_info_updater.h @@ -47,8 +47,8 @@ class VersionInfoUpdater : public policy::CloudPolicyStore::Observer { private: // policy::CloudPolicyStore::Observer interface: - virtual void OnStoreLoaded(policy::CloudPolicyStore* store) OVERRIDE; - virtual void OnStoreError(policy::CloudPolicyStore* store) OVERRIDE; + virtual void OnStoreLoaded(policy::CloudPolicyStore* store) override; + virtual void OnStoreError(policy::CloudPolicyStore* store) override; // Update the version label. void UpdateVersionLabel(); diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h index 5ad2130..ed27da6 100644 --- a/chrome/browser/chromeos/login/wizard_controller.h +++ b/chrome/browser/chromeos/login/wizard_controller.h @@ -136,7 +136,7 @@ class WizardController : public ScreenObserver, public ScreenManager { bool login_screen_started() const { return login_screen_started_; } // ScreenManager implementation. - virtual WizardScreen* CreateScreen(const std::string& screen_name) OVERRIDE; + virtual WizardScreen* CreateScreen(const std::string& screen_name) override; static const char kNetworkScreenName[]; static const char kLoginScreenName[]; @@ -233,15 +233,15 @@ class WizardController : public ScreenObserver, public ScreenManager { void PerformOOBECompletedActions(); // Overridden from ScreenObserver: - virtual void OnExit(ExitCodes exit_code) OVERRIDE; - virtual void ShowCurrentScreen() OVERRIDE; + virtual void OnExit(ExitCodes exit_code) override; + virtual void ShowCurrentScreen() override; virtual void OnSetUserNamePassword(const std::string& username, - const std::string& password) OVERRIDE; - virtual void SetUsageStatisticsReporting(bool val) OVERRIDE; - virtual bool GetUsageStatisticsReporting() const OVERRIDE; - virtual ErrorScreen* GetErrorScreen() OVERRIDE; - virtual void ShowErrorScreen() OVERRIDE; - virtual void HideErrorScreen(WizardScreen* parent_screen) OVERRIDE; + const std::string& password) override; + virtual void SetUsageStatisticsReporting(bool val) override; + virtual bool GetUsageStatisticsReporting() const override; + virtual ErrorScreen* GetErrorScreen() override; + virtual void ShowErrorScreen() override; + virtual void HideErrorScreen(WizardScreen* parent_screen) override; // Notification of a change in the state of an accessibility setting. void OnAccessibilityStatusChanged( diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index 826704b..7330dd0 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -107,11 +107,11 @@ const char kTimezoneResponseBody[] = class PrefStoreStub : public TestingPrefStore { public: // TestingPrefStore overrides: - virtual PrefReadError GetReadError() const OVERRIDE { + virtual PrefReadError GetReadError() const override { return PersistentPrefStore::PREF_READ_ERROR_JSON_PARSE; } - virtual bool IsInitializationComplete() const OVERRIDE { + virtual bool IsInitializationComplete() const override { return true; } @@ -224,7 +224,7 @@ class WizardControllerTest : public WizardInProcessBrowserTest { WizardController::kTestNoScreenName) {} virtual ~WizardControllerTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { AccessibilityManager::Get()-> SetProfileForTest(ProfileHelper::GetSigninProfile()); WizardInProcessBrowserTest::SetUpOnMainThread(); @@ -345,7 +345,7 @@ class WizardControllerTestURLFetcherFactory int id, const GURL& url, net::URLFetcher::RequestType request_type, - net::URLFetcherDelegate* d) OVERRIDE { + net::URLFetcherDelegate* d) override { if (StartsWithASCII( url.spec(), SimpleGeolocationProvider::DefaultGeolocationProviderURL().spec(), @@ -384,7 +384,7 @@ class WizardControllerFlowTest : public WizardControllerTest { protected: WizardControllerFlowTest() {} // Overriden from InProcessBrowserTest: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { WizardControllerTest::SetUpOnMainThread(); // Make sure that OOBE is run as an "official" build. @@ -702,7 +702,7 @@ class WizardControllerEnrollmentFlowTest : public WizardControllerFlowTest { protected: WizardControllerEnrollmentFlowTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { WizardControllerFlowTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( @@ -780,7 +780,7 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest { virtual ~WizardControllerBrokenLocalStateTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { WizardControllerTest::SetUpInProcessBrowserTestFixture(); fake_session_manager_client_ = new FakeSessionManagerClient; @@ -788,7 +788,7 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest { scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { base::PrefServiceFactory factory; factory.set_user_prefs(make_scoped_refptr(new PrefStoreStub())); local_state_ = factory.Create(new PrefRegistrySimple()).Pass(); @@ -800,7 +800,7 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest { WizardController::default_controller()->is_official_build_ = true; } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { WizardControllerTest::TearDownInProcessBrowserTestFixture(); } @@ -852,18 +852,18 @@ class WizardControllerProxyAuthOnSigninTest : public WizardControllerTest { virtual ~WizardControllerProxyAuthOnSigninTest() {} // Overridden from WizardControllerTest: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(proxy_server_.Start()); WizardControllerTest::SetUp(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { WizardControllerTest::SetUpOnMainThread(); WizardController::default_controller()->AdvanceToScreen( WizardController::kNetworkScreenName); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII(::switches::kProxyServer, proxy_server_.host_port_pair().ToString()); } @@ -893,7 +893,7 @@ class WizardControllerKioskFlowTest : public WizardControllerFlowTest { WizardControllerKioskFlowTest() {} // Overridden from InProcessBrowserTest: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { base::FilePath test_data_dir; ASSERT_TRUE(chromeos::test_utils::GetTestDataPath( "app_mode", "kiosk_manifest", &test_data_dir)); @@ -997,7 +997,7 @@ class WizardControllerOobeResumeTest : public WizardControllerTest { protected: WizardControllerOobeResumeTest() {} // Overriden from InProcessBrowserTest: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { WizardControllerTest::SetUpOnMainThread(); // Make sure that OOBE is run as an "official" build. diff --git a/chrome/browser/chromeos/memory/low_memory_observer.cc b/chrome/browser/chromeos/memory/low_memory_observer.cc index 7f30bdb..e1a63b6 100644 --- a/chrome/browser/chromeos/memory/low_memory_observer.cc +++ b/chrome/browser/chromeos/memory/low_memory_observer.cc @@ -80,8 +80,8 @@ class LowMemoryObserverImpl virtual ~FileWatcherDelegate() {} // Overrides for base::MessageLoopForIO::Watcher - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE {} - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { + virtual void OnFileCanWriteWithoutBlocking(int fd) override {} + virtual void OnFileCanReadWithoutBlocking(int fd) override { LOG(WARNING) << "Low memory condition detected. Discarding a tab."; // We can only discard tabs on the UI thread. base::Callback<void(void)> callback = base::Bind(&DiscardTab); diff --git a/chrome/browser/chromeos/memory/oom_priority_manager.cc b/chrome/browser/chromeos/memory/oom_priority_manager.cc index 2579b4c..cc14278 100644 --- a/chrome/browser/chromeos/memory/oom_priority_manager.cc +++ b/chrome/browser/chromeos/memory/oom_priority_manager.cc @@ -114,7 +114,7 @@ class OomMemoryDetails : public MemoryDetails { OomMemoryDetails(); // MemoryDetails overrides: - virtual void OnDetailsAvailable() OVERRIDE; + virtual void OnDetailsAvailable() override; private: virtual ~OomMemoryDetails() {} diff --git a/chrome/browser/chromeos/memory/oom_priority_manager.h b/chrome/browser/chromeos/memory/oom_priority_manager.h index e26a345..fcf4d92 100644 --- a/chrome/browser/chromeos/memory/oom_priority_manager.h +++ b/chrome/browser/chromeos/memory/oom_priority_manager.h @@ -130,7 +130,7 @@ class OomPriorityManager : public content::NotificationObserver { virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; base::RepeatingTimer<OomPriorityManager> timer_; base::OneShotTimer<OomPriorityManager> focus_tab_score_adjust_timer_; diff --git a/chrome/browser/chromeos/mobile/mobile_activator.h b/chrome/browser/chromeos/mobile/mobile_activator.h index 1957c30..260ca84 100644 --- a/chrome/browser/chromeos/mobile/mobile_activator.h +++ b/chrome/browser/chromeos/mobile/mobile_activator.h @@ -163,8 +163,8 @@ class MobileActivator virtual ~MobileActivator(); // NetworkStateHandlerObserver overrides. - virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE; - virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE; + virtual void DefaultNetworkChanged(const NetworkState* network) override; + virtual void NetworkPropertiesUpdated(const NetworkState* network) override; // Continue activation after inital setup (config load). Makes an // asynchronous call to NetworkConfigurationHandler::GetProperties. diff --git a/chrome/browser/chromeos/mobile_config.h b/chrome/browser/chromeos/mobile_config.h index 014231f..270fb36 100644 --- a/chrome/browser/chromeos/mobile_config.h +++ b/chrome/browser/chromeos/mobile_config.h @@ -151,7 +151,7 @@ class MobileConfig : public CustomizationDocument { const MobileConfig::LocaleConfig* GetLocaleConfig() const; protected: - virtual bool LoadManifestFromString(const std::string& manifest) OVERRIDE; + virtual bool LoadManifestFromString(const std::string& manifest) override; private: FRIEND_TEST_ALL_PREFIXES(MobileConfigTest, Basic); diff --git a/chrome/browser/chromeos/net/cert_verify_proc_chromeos.h b/chrome/browser/chromeos/net/cert_verify_proc_chromeos.h index a715e45..b35315f 100644 --- a/chrome/browser/chromeos/net/cert_verify_proc_chromeos.h +++ b/chrome/browser/chromeos/net/cert_verify_proc_chromeos.h @@ -38,7 +38,7 @@ class CertVerifyProcChromeOS : public net::CertVerifyProcNSS { int flags, net::CRLSet* crl_set, const net::CertificateList& additional_trust_anchors, - net::CertVerifyResult* verify_result) OVERRIDE; + net::CertVerifyResult* verify_result) override; // Check if the trust root of |current_chain| is allowed. // |is_chain_valid_arg| is actually a ChainVerifyArgs*, which is used to pass diff --git a/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc b/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc index 326b9c7..e2cc5d5 100644 --- a/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc +++ b/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc @@ -20,7 +20,7 @@ class CertVerifyProcChromeOSTest : public testing::Test { public: CertVerifyProcChromeOSTest() : user_1_("user1"), user_2_("user2") {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Initialize nss_util slots. ASSERT_TRUE(user_1_.constructed_successfully()); ASSERT_TRUE(user_2_.constructed_successfully()); diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.h b/chrome/browser/chromeos/net/network_portal_detector_impl.h index 9fdedbe..bf9070b 100644 --- a/chrome/browser/chromeos/net/network_portal_detector_impl.h +++ b/chrome/browser/chromeos/net/network_portal_detector_impl.h @@ -68,23 +68,23 @@ class NetworkPortalDetectorImpl virtual ~NetworkPortalDetectorImpl(); // NetworkPortalDetector implementation: - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void AddAndFireObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void AddAndFireObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; virtual CaptivePortalState GetCaptivePortalState( - const std::string& guid) OVERRIDE; - virtual bool IsEnabled() OVERRIDE; - virtual void Enable(bool start_detection) OVERRIDE; - virtual bool StartDetectionIfIdle() OVERRIDE; - virtual void SetStrategy(PortalDetectorStrategy::StrategyId id) OVERRIDE; + const std::string& guid) override; + virtual bool IsEnabled() override; + virtual void Enable(bool start_detection) override; + virtual bool StartDetectionIfIdle() override; + virtual void SetStrategy(PortalDetectorStrategy::StrategyId id) override; // NetworkStateHandlerObserver implementation: - virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE; + virtual void DefaultNetworkChanged(const NetworkState* network) override; // PortalDetectorStrategy::Delegate implementation: - virtual int NoResponseResultCount() OVERRIDE; - virtual base::TimeTicks AttemptStartTime() OVERRIDE; - virtual base::TimeTicks GetCurrentTimeTicks() OVERRIDE; + virtual int NoResponseResultCount() override; + virtual base::TimeTicks AttemptStartTime() override; + virtual base::TimeTicks GetCurrentTimeTicks() override; private: friend class NetworkPortalDetectorImplTest; @@ -143,7 +143,7 @@ class NetworkPortalDetectorImpl // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Stores captive portal state for a |network| and notifies observers. void OnDetectionCompleted(const NetworkState* network, diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc b/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc index d9a52ee..e749594 100644 --- a/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc +++ b/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc @@ -73,13 +73,13 @@ class TestObserver : public MessageCenterObserver { virtual void OnNotificationDisplayed( const std::string& notification_id, const message_center::DisplaySource source) - OVERRIDE { + override { if (notification_id == kNotificationId) MessageLoop::current()->PostTask(FROM_HERE, run_loop_->QuitClosure()); } virtual void OnNotificationRemoved(const std::string& notification_id, - bool by_user) OVERRIDE { + bool by_user) override { if (notification_id == kNotificationId && by_user) MessageLoop::current()->PostTask(FROM_HERE, run_loop_->QuitClosure()); } @@ -100,7 +100,7 @@ class NetworkPortalDetectorImplBrowserTest : LoginManagerTest(false), network_portal_detector_(NULL) {} virtual ~NetworkPortalDetectorImplBrowserTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { LoginManagerTest::SetUpOnMainThread(); ShillServiceClient::TestInterface* service_test = diff --git a/chrome/browser/chromeos/net/network_portal_detector_test_impl.h b/chrome/browser/chromeos/net/network_portal_detector_test_impl.h index 9924ffc..7dfb2ec 100644 --- a/chrome/browser/chromeos/net/network_portal_detector_test_impl.h +++ b/chrome/browser/chromeos/net/network_portal_detector_test_impl.h @@ -27,16 +27,16 @@ class NetworkPortalDetectorTestImpl : public NetworkPortalDetector { void NotifyObserversForTesting(); // NetworkPortalDetector implementation: - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void AddAndFireObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void AddAndFireObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; virtual CaptivePortalState GetCaptivePortalState( - const std::string& service_path) OVERRIDE; - virtual bool IsEnabled() OVERRIDE; - virtual void Enable(bool start_detection) OVERRIDE; - virtual bool StartDetectionIfIdle() OVERRIDE; + const std::string& service_path) override; + virtual bool IsEnabled() override; + virtual void Enable(bool start_detection) override; + virtual bool StartDetectionIfIdle() override; - virtual void SetStrategy(PortalDetectorStrategy::StrategyId id) OVERRIDE; + virtual void SetStrategy(PortalDetectorStrategy::StrategyId id) override; PortalDetectorStrategy::StrategyId strategy_id() const { return strategy_id_; diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller.cc b/chrome/browser/chromeos/net/network_portal_notification_controller.cc index bd25775..897511f 100644 --- a/chrome/browser/chromeos/net/network_portal_notification_controller.cc +++ b/chrome/browser/chromeos/net/network_portal_notification_controller.cc @@ -54,10 +54,10 @@ class NetworkPortalNotificationControllerDelegate NetworkPortalNotificationControllerDelegate(): clicked_(false) {} // Overridden from message_center::NotificationDelegate: - virtual void Display() OVERRIDE; - virtual void Error() OVERRIDE; - virtual void Close(bool by_user) OVERRIDE; - virtual void Click() OVERRIDE; + virtual void Display() override; + virtual void Error() override; + virtual void Close(bool by_user) override; + virtual void Click() override; private: virtual ~NetworkPortalNotificationControllerDelegate() {} diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc b/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc index 3ef1ad7..ee1064e 100644 --- a/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc +++ b/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc @@ -30,19 +30,19 @@ class NotificationObserver : public message_center::MessageCenterObserver { // Overridden from message_center::MessageCenterObserver: virtual void OnNotificationAdded( - const std::string& notification_id) OVERRIDE { + const std::string& notification_id) override { if (notification_id == kNotificationId) ++add_count_; } virtual void OnNotificationRemoved(const std::string& notification_id, - bool /* by_user */) OVERRIDE { + bool /* by_user */) override { if (notification_id == kNotificationId) ++remove_count_; } virtual void OnNotificationUpdated( - const std::string& notification_id) OVERRIDE { + const std::string& notification_id) override { if (notification_id == kNotificationId) ++update_count_; } @@ -66,14 +66,14 @@ class NetworkPortalNotificationControllerTest : public testing::Test { NetworkPortalNotificationControllerTest() {} virtual ~NetworkPortalNotificationControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CommandLine* cl = CommandLine::ForCurrentProcess(); cl->AppendSwitch(switches::kEnableNetworkPortalNotification); MessageCenter::Initialize(); MessageCenter::Get()->AddObserver(&observer_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { MessageCenter::Get()->RemoveObserver(&observer_); MessageCenter::Shutdown(); } diff --git a/chrome/browser/chromeos/net/onc_utils.cc b/chrome/browser/chromeos/net/onc_utils.cc index dae67a2..f49da22 100644 --- a/chrome/browser/chromeos/net/onc_utils.cc +++ b/chrome/browser/chromeos/net/onc_utils.cc @@ -157,7 +157,7 @@ class UserStringSubstitution : public chromeos::onc::StringSubstitution { virtual ~UserStringSubstitution() {} virtual bool GetSubstitute(const std::string& placeholder, - std::string* substitute) const OVERRIDE { + std::string* substitute) const override { if (placeholder == ::onc::substitutes::kLoginIDField) *substitute = user_->GetAccountName(false); else if (placeholder == ::onc::substitutes::kEmailField) diff --git a/chrome/browser/chromeos/offline/offline_load_page.h b/chrome/browser/chromeos/offline/offline_load_page.h index 2ff53bb..d75b34e 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.h +++ b/chrome/browser/chromeos/offline/offline_load_page.h @@ -57,16 +57,16 @@ class OfflineLoadPage friend class TestOfflineLoadPage; // InterstitialPageDelegate implementation. - virtual std::string GetHTMLContents() OVERRIDE; - virtual void CommandReceived(const std::string& command) OVERRIDE; + virtual std::string GetHTMLContents() override; + virtual void CommandReceived(const std::string& command) override; virtual void OverrideRendererPrefs( - content::RendererPreferences* prefs) OVERRIDE; - virtual void OnProceed() OVERRIDE; - virtual void OnDontProceed() OVERRIDE; + content::RendererPreferences* prefs) override; + virtual void OnProceed() override; + virtual void OnDontProceed() override; // net::NetworkChangeNotifier::ConnectionTypeObserver overrides. virtual void OnConnectionTypeChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; CompletionCallback callback_; diff --git a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc index f07205ef..f1e0731 100644 --- a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc +++ b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc @@ -32,7 +32,7 @@ class TestOfflineLoadPage : public chromeos::OfflineLoadPage { } // chromeos::OfflineLoadPage override. - virtual void NotifyBlockingPageComplete(bool proceed) OVERRIDE; + virtual void NotifyBlockingPageComplete(bool proceed) override; private: OfflineLoadPageTest* test_page_; diff --git a/chrome/browser/chromeos/options/cert_library.h b/chrome/browser/chromeos/options/cert_library.h index 0006527..b69bd2c 100644 --- a/chrome/browser/chromeos/options/cert_library.h +++ b/chrome/browser/chromeos/options/cert_library.h @@ -83,7 +83,7 @@ class CertLibrary : public CertLoader::Observer { // CertLoader::Observer virtual void OnCertificatesLoaded(const net::CertificateList&, - bool initial_load) OVERRIDE; + bool initial_load) override; private: CertLibrary(); diff --git a/chrome/browser/chromeos/options/network_config_view.h b/chrome/browser/chromeos/options/network_config_view.h index a04da78..58b45bf 100644 --- a/chrome/browser/chromeos/options/network_config_view.h +++ b/chrome/browser/chromeos/options/network_config_view.h @@ -55,23 +55,23 @@ class NetworkConfigView : public views::DialogDelegateView, // views::DialogDelegate methods. virtual base::string16 GetDialogButtonLabel( - ui::DialogButton button) const OVERRIDE; - virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE; - virtual bool Cancel() OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual views::View* CreateExtraView() OVERRIDE; - virtual views::View* GetInitiallyFocusedView() OVERRIDE; + ui::DialogButton button) const override; + virtual bool IsDialogButtonEnabled(ui::DialogButton button) const override; + virtual bool Cancel() override; + virtual bool Accept() override; + virtual views::View* CreateExtraView() override; + virtual views::View* GetInitiallyFocusedView() override; // views::WidgetDelegate methods. - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual ui::ModalType GetModalType() const OVERRIDE; + virtual base::string16 GetWindowTitle() const override; + virtual ui::ModalType GetModalType() const override; // views::View overrides. - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) override; // views::ButtonListener overrides. virtual void ButtonPressed( - views::Button* sender, const ui::Event& event) OVERRIDE; + views::Button* sender, const ui::Event& event) override; void set_delegate(Delegate* delegate) { delegate_ = delegate; @@ -79,10 +79,10 @@ class NetworkConfigView : public views::DialogDelegateView, protected: // views::View overrides: - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; private: NetworkConfigView(); @@ -171,8 +171,8 @@ class ControlledSettingIndicatorView : public views::View { protected: // views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; private: // Initializes the view. diff --git a/chrome/browser/chromeos/options/passphrase_textfield.h b/chrome/browser/chromeos/options/passphrase_textfield.h index 3a2113d..ac6b934 100644 --- a/chrome/browser/chromeos/options/passphrase_textfield.h +++ b/chrome/browser/chromeos/options/passphrase_textfield.h @@ -21,8 +21,8 @@ class PassphraseTextfield : public views::Textfield { // Override views::Textfield so that when focus is gained, then clear out the // fake password if appropriate. Replace it when focus is lost if the user has // not typed in a new password. - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual void OnFocus() override; + virtual void OnBlur() override; // Returns the passphrase. If it's unchanged, then returns an empty string. std::string GetPassphrase(); diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc index c37c1b9..8f7fbfa 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.cc +++ b/chrome/browser/chromeos/options/vpn_config_view.cc @@ -109,8 +109,8 @@ class ProviderTypeComboboxModel : public ui::ComboboxModel { virtual ~ProviderTypeComboboxModel(); // Overridden from ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; private: DISALLOW_COPY_AND_ASSIGN(ProviderTypeComboboxModel); @@ -122,8 +122,8 @@ class VpnServerCACertComboboxModel : public ui::ComboboxModel { virtual ~VpnServerCACertComboboxModel(); // Overridden from ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; private: DISALLOW_COPY_AND_ASSIGN(VpnServerCACertComboboxModel); @@ -135,8 +135,8 @@ class VpnUserCertComboboxModel : public ui::ComboboxModel { virtual ~VpnUserCertComboboxModel(); // Overridden from ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; private: DISALLOW_COPY_AND_ASSIGN(VpnUserCertComboboxModel); diff --git a/chrome/browser/chromeos/options/vpn_config_view.h b/chrome/browser/chromeos/options/vpn_config_view.h index a0baeb9..5ef9df4 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.h +++ b/chrome/browser/chromeos/options/vpn_config_view.h @@ -51,27 +51,27 @@ class VPNConfigView : public ChildNetworkConfigView, // views::TextfieldController: virtual void ContentsChanged(views::Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; virtual bool HandleKeyEvent(views::Textfield* sender, - const ui::KeyEvent& key_event) OVERRIDE; + const ui::KeyEvent& key_event) override; // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // views::ComboboxListener: - virtual void OnPerformAction(views::Combobox* combobox) OVERRIDE; + virtual void OnPerformAction(views::Combobox* combobox) override; // CertLibrary::Observer: - virtual void OnCertificatesLoaded(bool initial_load) OVERRIDE; + virtual void OnCertificatesLoaded(bool initial_load) override; // ChildNetworkConfigView: - virtual base::string16 GetTitle() const OVERRIDE; - virtual views::View* GetInitiallyFocusedView() OVERRIDE; - virtual bool CanLogin() OVERRIDE; - virtual bool Login() OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual void InitFocus() OVERRIDE; + virtual base::string16 GetTitle() const override; + virtual views::View* GetInitiallyFocusedView() override; + virtual bool CanLogin() override; + virtual bool Login() override; + virtual void Cancel() override; + virtual void InitFocus() override; private: // Initializes data members and create UI controls. diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc index 8f0680f..2263c2d 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.cc +++ b/chrome/browser/chromeos/options/wifi_config_view.cc @@ -52,7 +52,7 @@ class ComboboxWithWidth : public views::Combobox { width_(width) { } virtual ~ComboboxWithWidth() {} - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { gfx::Size size = Combobox::GetPreferredSize(); size.set_width(width_); return size; @@ -105,8 +105,8 @@ class SecurityComboboxModel : public ui::ComboboxModel { virtual ~SecurityComboboxModel(); // Overridden from ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; private: DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel); @@ -118,8 +118,8 @@ class EAPMethodComboboxModel : public ui::ComboboxModel { virtual ~EAPMethodComboboxModel(); // Overridden from ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; private: DISALLOW_COPY_AND_ASSIGN(EAPMethodComboboxModel); @@ -131,8 +131,8 @@ class Phase2AuthComboboxModel : public ui::ComboboxModel { virtual ~Phase2AuthComboboxModel(); // Overridden from ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; private: views::Combobox* eap_method_combobox_; @@ -146,8 +146,8 @@ class ServerCACertComboboxModel : public ui::ComboboxModel { virtual ~ServerCACertComboboxModel(); // Overridden from ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; private: DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel); @@ -159,8 +159,8 @@ class UserCertComboboxModel : public ui::ComboboxModel { virtual ~UserCertComboboxModel(); // Overridden from ui::ComboboxModel: - virtual int GetItemCount() const OVERRIDE; - virtual base::string16 GetItemAt(int index) OVERRIDE; + virtual int GetItemCount() const override; + virtual base::string16 GetItemAt(int index) override; private: WifiConfigView* owner_; diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h index 2042430..c9de05a 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.h +++ b/chrome/browser/chromeos/options/wifi_config_view.h @@ -61,31 +61,31 @@ class WifiConfigView : public ChildNetworkConfigView, // views::TextfieldController virtual void ContentsChanged(views::Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; virtual bool HandleKeyEvent(views::Textfield* sender, - const ui::KeyEvent& key_event) OVERRIDE; + const ui::KeyEvent& key_event) override; // views::ButtonListener virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // views::ComboboxListener - virtual void OnPerformAction(views::Combobox* combobox) OVERRIDE; + virtual void OnPerformAction(views::Combobox* combobox) override; // CertLibrary::Observer - virtual void OnCertificatesLoaded(bool initial_load) OVERRIDE; + virtual void OnCertificatesLoaded(bool initial_load) override; // ChildNetworkConfigView - virtual base::string16 GetTitle() const OVERRIDE; - virtual views::View* GetInitiallyFocusedView() OVERRIDE; - virtual bool CanLogin() OVERRIDE; - virtual bool Login() OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual void InitFocus() OVERRIDE; - virtual bool IsConfigureDialog() OVERRIDE; + virtual base::string16 GetTitle() const override; + virtual views::View* GetInitiallyFocusedView() override; + virtual bool CanLogin() override; + virtual bool Login() override; + virtual void Cancel() override; + virtual void InitFocus() override; + virtual bool IsConfigureDialog() override; // NetworkStateHandlerObserver - virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE; + virtual void NetworkPropertiesUpdated(const NetworkState* network) override; // Parses a UI |property| from the ONC associated with |network|. |key| // is the property name within the ONC dictionary. diff --git a/chrome/browser/chromeos/options/wimax_config_view.h b/chrome/browser/chromeos/options/wimax_config_view.h index bc577bea..355e01f 100644 --- a/chrome/browser/chromeos/options/wimax_config_view.h +++ b/chrome/browser/chromeos/options/wimax_config_view.h @@ -37,21 +37,21 @@ class WimaxConfigView : public ChildNetworkConfigView, // views::TextfieldController: virtual void ContentsChanged(views::Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; virtual bool HandleKeyEvent(views::Textfield* sender, - const ui::KeyEvent& key_event) OVERRIDE; + const ui::KeyEvent& key_event) override; // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // ChildNetworkConfigView: - virtual base::string16 GetTitle() const OVERRIDE; - virtual views::View* GetInitiallyFocusedView() OVERRIDE; - virtual bool CanLogin() OVERRIDE; - virtual bool Login() OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual void InitFocus() OVERRIDE; + virtual base::string16 GetTitle() const override; + virtual views::View* GetInitiallyFocusedView() override; + virtual bool CanLogin() override; + virtual bool Login() override; + virtual void Cancel() override; + virtual void InitFocus() override; private: // Initializes UI. diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h index 3ef3d7e..8f47b4d 100644 --- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h +++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h @@ -47,15 +47,15 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService, // ownership::OwnerSettingsService implementation: virtual void SignAndStorePolicyAsync( scoped_ptr<enterprise_management::PolicyData> policy, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; // NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // SessionManagerClient::Observer: - virtual void OwnerKeySet(bool success) OVERRIDE; + virtual void OwnerKeySet(bool success) override; // Checks if the user is the device owner, without the user profile having to // been initialized. Should be used only if login state is in safe mode. @@ -80,10 +80,10 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService, virtual void ReloadKeypairImpl(const base::Callback< void(const scoped_refptr<ownership::PublicKey>& public_key, const scoped_refptr<ownership::PrivateKey>& private_key)>& callback) - OVERRIDE; + override; // Possibly notifies DeviceSettingsService that owner's keypair is loaded. - virtual void OnPostKeypairLoadedActions() OVERRIDE; + virtual void OnPostKeypairLoadedActions() override; // Performs next operation in the queue. void StartNextOperation(); diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h index 3409456..6352b0a 100644 --- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h +++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h @@ -43,11 +43,11 @@ class OwnerSettingsServiceChromeOSFactory static KeyedService* BuildInstanceFor(content::BrowserContext* context); // BrowserContextKeyedBaseFactory overrides: - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; + virtual bool ServiceIsCreatedWithBrowserContext() const override; // BrowserContextKeyedServiceFactory implementation: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* browser_context) const OVERRIDE; + content::BrowserContext* browser_context) const override; scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_; diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc b/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc index 5b0151a..f094c5f 100644 --- a/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc +++ b/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc @@ -141,7 +141,7 @@ class GenerateRSAKeyState : public NSSOperationState { virtual ~GenerateRSAKeyState() {} virtual void OnError(const tracked_objects::Location& from, - const std::string& error_message) OVERRIDE { + const std::string& error_message) override { CallBack(from, std::string() /* no public key */, error_message); } @@ -168,7 +168,7 @@ class SignState : public NSSOperationState { virtual ~SignState() {} virtual void OnError(const tracked_objects::Location& from, - const std::string& error_message) OVERRIDE { + const std::string& error_message) override { CallBack(from, std::string() /* no signature */, error_message); } @@ -194,7 +194,7 @@ class GetCertificatesState : public NSSOperationState { virtual ~GetCertificatesState() {} virtual void OnError(const tracked_objects::Location& from, - const std::string& error_message) OVERRIDE { + const std::string& error_message) override { CallBack(from, scoped_ptr<net::CertificateList>() /* no certificates */, error_message); @@ -221,7 +221,7 @@ class ImportCertificateState : public NSSOperationState { virtual ~ImportCertificateState() {} virtual void OnError(const tracked_objects::Location& from, - const std::string& error_message) OVERRIDE { + const std::string& error_message) override { CallBack(from, error_message); } @@ -244,7 +244,7 @@ class RemoveCertificateState : public NSSOperationState { virtual ~RemoveCertificateState() {} virtual void OnError(const tracked_objects::Location& from, - const std::string& error_message) OVERRIDE { + const std::string& error_message) override { CallBack(from, error_message); } @@ -266,7 +266,7 @@ class GetTokensState : public NSSOperationState { virtual ~GetTokensState() {} virtual void OnError(const tracked_objects::Location& from, - const std::string& error_message) OVERRIDE { + const std::string& error_message) override { CallBack(from, scoped_ptr<std::vector<std::string> >() /* no token ids */, error_message); diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h b/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h index d282be0..26bbfcf 100644 --- a/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h +++ b/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h @@ -35,9 +35,9 @@ class PlatformKeysServiceFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory: virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; DISALLOW_COPY_AND_ASSIGN(PlatformKeysServiceFactory); }; diff --git a/chrome/browser/chromeos/policy/app_pack_updater.cc b/chrome/browser/chromeos/policy/app_pack_updater.cc index a327d0e..6017678 100644 --- a/chrome/browser/chromeos/policy/app_pack_updater.cc +++ b/chrome/browser/chromeos/policy/app_pack_updater.cc @@ -44,7 +44,7 @@ class AppPackExternalLoader } // Implementation of extensions::ExternalLoader: - virtual void StartLoading() OVERRIDE { + virtual void StartLoading() override { prefs_.reset(app_pack_prefs_.DeepCopy()); VLOG(1) << "AppPack extension loader publishing " << app_pack_prefs_.size() << " crx files."; diff --git a/chrome/browser/chromeos/policy/app_pack_updater.h b/chrome/browser/chromeos/policy/app_pack_updater.h index 2b83f54..e40698e 100644 --- a/chrome/browser/chromeos/policy/app_pack_updater.h +++ b/chrome/browser/chromeos/policy/app_pack_updater.h @@ -65,7 +65,7 @@ class AppPackUpdater : public chromeos::ExternalCache::Delegate { private: // Implementation of ExternalCache::Delegate: virtual void OnExtensionListsUpdated( - const base::DictionaryValue* prefs) OVERRIDE; + const base::DictionaryValue* prefs) override; // Called when the app pack device setting changes. void AppPackChanged(); diff --git a/chrome/browser/chromeos/policy/auto_enrollment_client.h b/chrome/browser/chromeos/policy/auto_enrollment_client.h index 1adc415..e7565f3 100644 --- a/chrome/browser/chromeos/policy/auto_enrollment_client.h +++ b/chrome/browser/chromeos/policy/auto_enrollment_client.h @@ -110,7 +110,7 @@ class AutoEnrollmentClient // Implementation of net::NetworkChangeNotifier::NetworkChangeObserver: virtual void OnNetworkChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; private: typedef bool (AutoEnrollmentClient::*RequestCompletionHandler)( diff --git a/chrome/browser/chromeos/policy/auto_enrollment_client_unittest.cc b/chrome/browser/chromeos/policy/auto_enrollment_client_unittest.cc index d8fb571..bdeb712 100644 --- a/chrome/browser/chromeos/policy/auto_enrollment_client_unittest.cc +++ b/chrome/browser/chromeos/policy/auto_enrollment_client_unittest.cc @@ -48,13 +48,13 @@ class AutoEnrollmentClientTest : public testing::Test { local_state_(scoped_testing_local_state_.Get()), state_(AUTO_ENROLLMENT_STATE_PENDING) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CreateClient(kStateKey, true, 4, 8); ASSERT_FALSE(local_state_->GetUserPref(prefs::kShouldAutoEnroll)); ASSERT_FALSE(local_state_->GetUserPref(prefs::kAutoEnrollmentPowerLimit)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Flush any deletion tasks. base::RunLoop().RunUntilIdle(); } diff --git a/chrome/browser/chromeos/policy/blocking_login_browsertest.cc b/chrome/browser/chromeos/policy/blocking_login_browsertest.cc index 7cae921..c0f7533 100644 --- a/chrome/browser/chromeos/policy/blocking_login_browsertest.cc +++ b/chrome/browser/chromeos/policy/blocking_login_browsertest.cc @@ -87,7 +87,7 @@ class BlockingLoginTest public: BlockingLoginTest() : profile_added_(NULL) {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Initialize the test server early, so that we can use its base url for // the command line flags. ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); @@ -109,7 +109,7 @@ class BlockingLoginTest embedded_test_server()->GetURL("/device_management").spec()); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { fake_gaia_.Initialize(); embedded_test_server()->RegisterRequestHandler( @@ -122,7 +122,7 @@ class BlockingLoginTest content::NotificationService::AllSources()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { RunUntilIdle(); EXPECT_TRUE(responses_.empty()); STLDeleteElements(&responses_); @@ -131,7 +131,7 @@ class BlockingLoginTest virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { ASSERT_EQ(chrome::NOTIFICATION_PROFILE_ADDED, type); ASSERT_FALSE(profile_added_); profile_added_ = content::Source<Profile>(source).ptr(); diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h index e435b88..5504eb6 100644 --- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h +++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h @@ -44,7 +44,7 @@ class BrowserPolicyConnectorChromeOS : public ChromeBrowserPolicyConnector { virtual void Init( PrefService* local_state, - scoped_refptr<net::URLRequestContextGetter> request_context) OVERRIDE; + scoped_refptr<net::URLRequestContextGetter> request_context) override; // Shutdown() is called from BrowserProcessImpl::StartTearDown() but |this| // observes some objects that get destroyed earlier. PreShutdown() is called @@ -52,7 +52,7 @@ class BrowserPolicyConnectorChromeOS : public ChromeBrowserPolicyConnector { // connection to these dependencies to be severed earlier. void PreShutdown(); - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Returns true if this device is managed by an enterprise (as opposed to // a local owner). diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base.h b/chrome/browser/chromeos/policy/cloud_external_data_manager_base.h index dc82ca6..55d2e10 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base.h +++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base.h @@ -47,14 +47,14 @@ class CloudExternalDataManagerBase : public CloudExternalDataManager, scoped_ptr<CloudExternalDataStore> external_data_store); // CloudExternalDataManager: - virtual void SetPolicyStore(CloudPolicyStore* policy_store) OVERRIDE; - virtual void OnPolicyStoreLoaded() OVERRIDE; + virtual void SetPolicyStore(CloudPolicyStore* policy_store) override; + virtual void OnPolicyStoreLoaded() override; virtual void Connect( - scoped_refptr<net::URLRequestContextGetter> request_context) OVERRIDE; - virtual void Disconnect() OVERRIDE; + scoped_refptr<net::URLRequestContextGetter> request_context) override; + virtual void Disconnect() override; virtual void Fetch( const std::string& policy, - const ExternalDataFetcher::FetchCallback& callback) OVERRIDE; + const ExternalDataFetcher::FetchCallback& callback) override; // Allows policies to reference |max_size| bytes of external data even if no // |max_size| was specified in policy_templates.json. diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc index e1c6a58..fe9d3f9 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc @@ -74,7 +74,7 @@ class FakeURLFetcherFactory : public net::FakeURLFetcherFactory { int id, const GURL& url, net::URLFetcher::RequestType request_type, - net::URLFetcherDelegate* delegate) OVERRIDE; + net::URLFetcherDelegate* delegate) override; private: DISALLOW_COPY_AND_ASSIGN(FakeURLFetcherFactory); @@ -104,8 +104,8 @@ class CloudExternalDataManagerBaseTest : public testing::Test { protected: CloudExternalDataManagerBaseTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; void SetUpExternalDataManager(); diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc index 084d12d..81786ec 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc @@ -45,7 +45,7 @@ class CloudExternalDataPolicyObserver::PolicyServiceObserver // PolicyService::Observer: virtual void OnPolicyUpdated(const PolicyNamespace& ns, const PolicyMap& previous, - const PolicyMap& current) OVERRIDE; + const PolicyMap& current) override; private: CloudExternalDataPolicyObserver* parent_; diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h index d3c4a2e..925530a 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h +++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h @@ -69,11 +69,11 @@ class CloudExternalDataPolicyObserver // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // DeviceLocalAccountPolicyService::Observer: - virtual void OnPolicyUpdated(const std::string& user_id) OVERRIDE; - virtual void OnDeviceLocalAccountsChanged() OVERRIDE; + virtual void OnPolicyUpdated(const std::string& user_id) override; + virtual void OnDeviceLocalAccountsChanged() override; private: // Helper class that observes |policy_| for a logged-in user. diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc index 6a0c5fc..1a22873 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc @@ -98,17 +98,17 @@ class CloudExternalDataPolicyObserverTest virtual ~CloudExternalDataPolicyObserverTest(); // chromeos::DeviceSettingsTestBase: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; // CloudExternalDataPolicyObserver::Delegate: virtual void OnExternalDataSet(const std::string& policy, - const std::string& user_id) OVERRIDE; + const std::string& user_id) override; virtual void OnExternalDataCleared(const std::string& policy, - const std::string& user_id) OVERRIDE; + const std::string& user_id) override; virtual void OnExternalDataFetched(const std::string& policy, const std::string& user_id, - scoped_ptr<std::string> data) OVERRIDE; + scoped_ptr<std::string> data) override; void CreateObserver(); diff --git a/chrome/browser/chromeos/policy/cloud_external_data_store_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_store_unittest.cc index 9491b3a..4ac05cd1 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_store_unittest.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_store_unittest.cc @@ -31,7 +31,7 @@ class CouldExternalDataStoreTest : public testing::Test { public: CouldExternalDataStoreTest(); - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; protected: const std::string kData1Hash; diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h index 66f6deb..4bd8d36 100644 --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h @@ -29,10 +29,10 @@ class ExternalDataPolicyHandler : public TypeCheckingPolicyHandler { // TypeCheckingPolicyHandler: virtual bool CheckPolicySettings(const PolicyMap& policies, - PolicyErrorMap* errors) OVERRIDE; + PolicyErrorMap* errors) override; virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: DISALLOW_COPY_AND_ASSIGN(ExternalDataPolicyHandler); @@ -50,10 +50,10 @@ class NetworkConfigurationPolicyHandler : public TypeCheckingPolicyHandler { // ConfigurationPolicyHandler methods: virtual bool CheckPolicySettings(const PolicyMap& policies, - PolicyErrorMap* errors) OVERRIDE; + PolicyErrorMap* errors) override; virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; - virtual void PrepareForDisplaying(PolicyMap* policies) const OVERRIDE; + PrefValueMap* prefs) override; + virtual void PrepareForDisplaying(PolicyMap* policies) const override; private: explicit NetworkConfigurationPolicyHandler( @@ -86,7 +86,7 @@ class PinnedLauncherAppsPolicyHandler // ExtensionListPolicyHandler methods: virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: DISALLOW_COPY_AND_ASSIGN(PinnedLauncherAppsPolicyHandler); @@ -99,7 +99,7 @@ class ScreenMagnifierPolicyHandler : public IntRangePolicyHandlerBase { // IntRangePolicyHandlerBase: virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: DISALLOW_COPY_AND_ASSIGN(ScreenMagnifierPolicyHandler); @@ -116,7 +116,7 @@ class LoginScreenPowerManagementPolicyHandler // SchemaValidatingPolicyHandler: virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: DISALLOW_COPY_AND_ASSIGN(LoginScreenPowerManagementPolicyHandler); @@ -131,7 +131,7 @@ class DeprecatedIdleActionHandler : public IntRangePolicyHandlerBase { // ConfigurationPolicyHandler methods: virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: DISALLOW_COPY_AND_ASSIGN(DeprecatedIdleActionHandler); @@ -146,7 +146,7 @@ class PowerManagementIdleSettingsPolicyHandler // SchemaValidatingPolicyHandler: virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: DISALLOW_COPY_AND_ASSIGN(PowerManagementIdleSettingsPolicyHandler); @@ -159,7 +159,7 @@ class ScreenLockDelayPolicyHandler : public SchemaValidatingPolicyHandler { // SchemaValidatingPolicyHandler: virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: DISALLOW_COPY_AND_ASSIGN(ScreenLockDelayPolicyHandler); diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc index 8ab6517..6a62d33 100644 --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc @@ -34,7 +34,7 @@ class LoginScreenPowerManagementPolicyHandlerTest : public testing::Test { protected: LoginScreenPowerManagementPolicyHandlerTest(); - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; Schema chrome_schema_; diff --git a/chrome/browser/chromeos/policy/consumer_management_service.cc b/chrome/browser/chromeos/policy/consumer_management_service.cc index 448b97d..b6d0961 100644 --- a/chrome/browser/chromeos/policy/consumer_management_service.cc +++ b/chrome/browser/chromeos/policy/consumer_management_service.cc @@ -80,13 +80,13 @@ class DesktopNotificationDelegate : public NotificationDelegate { const base::Closure& button_click_callback); // NotificationDelegate: - virtual std::string id() const OVERRIDE; - virtual content::WebContents* GetWebContents() const OVERRIDE; - virtual void Display() OVERRIDE; - virtual void ButtonClick(int button_index) OVERRIDE; - virtual void Error() OVERRIDE; - virtual void Close(bool by_user) OVERRIDE; - virtual void Click() OVERRIDE; + virtual std::string id() const override; + virtual content::WebContents* GetWebContents() const override; + virtual void Display() override; + virtual void ButtonClick(int button_index) override; + virtual void Error() override; + virtual void Close(bool by_user) override; + virtual void Click() override; private: virtual ~DesktopNotificationDelegate(); diff --git a/chrome/browser/chromeos/policy/consumer_management_service.h b/chrome/browser/chromeos/policy/consumer_management_service.h index c460658..cf10abc 100644 --- a/chrome/browser/chromeos/policy/consumer_management_service.h +++ b/chrome/browser/chromeos/policy/consumer_management_service.h @@ -145,25 +145,25 @@ class ConsumerManagementService void SetOwner(const std::string& user_id, const SetOwnerCallback& callback); // chromeos::DeviceSettingsService::Observer: - virtual void OwnershipStatusChanged() OVERRIDE; - virtual void DeviceSettingsUpdated() OVERRIDE; + virtual void OwnershipStatusChanged() override; + virtual void DeviceSettingsUpdated() override; // content::NotificationObserver implmentation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // OAuth2TokenService::Observer: - virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE; + virtual void OnRefreshTokenAvailable(const std::string& account_id) override; // OAuth2TokenService::Consumer: virtual void OnGetTokenSuccess( const OAuth2TokenService::Request* request, const std::string& access_token, - const base::Time& expiration_time) OVERRIDE; + const base::Time& expiration_time) override; virtual void OnGetTokenFailure( const OAuth2TokenService::Request* request, - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; OAuth2TokenService::Request* GetTokenRequestForTesting() { return token_request_.get(); diff --git a/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc b/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc index 512eef3..e27c298 100644 --- a/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc +++ b/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc @@ -78,7 +78,7 @@ class ConsumerManagementServiceTest : public BrowserWithTestWindowTest { MockFlushAndSignBootAttributes)); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { BrowserWithTestWindowTest::SetUp(); testing_profile_manager_.reset(new TestingProfileManager( @@ -89,7 +89,7 @@ class ConsumerManagementServiceTest : public BrowserWithTestWindowTest { NULL)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { testing_profile_manager_.reset(); service_.reset(); @@ -247,7 +247,7 @@ class ConsumerManagementServiceEnrollmentTest scoped_ptr<DeviceCloudPolicyInitializer>(fake_initializer_)); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ConsumerManagementServiceTest::SetUp(); // Set up the testing profile. @@ -269,7 +269,7 @@ class ConsumerManagementServiceEnrollmentTest ConsumerManagementService::ENROLLMENT_STAGE_OWNER_STORED); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { g_browser_process->notification_ui_manager()->CancelAll(); ConsumerManagementServiceTest::TearDown(); diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc index e5a13d4..8023ec2 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc @@ -19,7 +19,7 @@ class DeviceCloudPolicyManagedBrowserTest : public DevicePolicyCrosBrowserTest { protected: DeviceCloudPolicyManagedBrowserTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture(); InstallOwnerKey(); MarkAsEnterpriseOwned(); @@ -42,7 +42,7 @@ class DeviceCloudPolicyUnmanagedBrowserTest protected: DeviceCloudPolicyUnmanagedBrowserTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture(); } diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h index c487ac7..4483d19 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h +++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h @@ -95,8 +95,8 @@ class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer { std::string GetForcedEnrollmentDomain() const; // CloudPolicyStore::Observer: - virtual void OnStoreLoaded(CloudPolicyStore* store) OVERRIDE; - virtual void OnStoreError(CloudPolicyStore* store) OVERRIDE; + virtual void OnStoreLoaded(CloudPolicyStore* store) override; + virtual void OnStoreError(CloudPolicyStore* store) override; private: // Handles completion signaled by |enrollment_handler_|. diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc index 4fca55a..0f62250 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc +++ b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc @@ -57,10 +57,10 @@ class DeviceCloudPolicyInvalidator::InvalidationServiceObserver // public syncer::InvalidationHandler: virtual void OnInvalidatorStateChange( - syncer::InvalidatorState state) OVERRIDE; + syncer::InvalidatorState state) override; virtual void OnIncomingInvalidation( - const syncer::ObjectIdInvalidationMap& invalidation_map) OVERRIDE; - virtual std::string GetOwnerName() const OVERRIDE; + const syncer::ObjectIdInvalidationMap& invalidation_map) override; + virtual std::string GetOwnerName() const override; private: DeviceCloudPolicyInvalidator* parent_; diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h index 875719f..f180225 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h +++ b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h @@ -39,7 +39,7 @@ class DeviceCloudPolicyInvalidator : public content::NotificationObserver { // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: friend class DeviceCloudPolicyInvalidatorTest; diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc index 808b73c..6b03b66 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc +++ b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc @@ -76,8 +76,8 @@ class DeviceCloudPolicyInvalidatorTest : public testing::Test { virtual ~DeviceCloudPolicyInvalidatorTest(); // testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; // Ownership is not passed. The Profile is owned by the global ProfileManager. Profile *LogInAndReturnProfile(const std::string& user_id); diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h index 5cb0be5..f98284d 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h +++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h @@ -55,7 +55,7 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager { bool IsSharkRequisition() const; // CloudPolicyManager: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Pref registration helper. static void RegisterPrefs(PrefRegistrySimple* registry); diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc index 09d8da2..121b7bc 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc @@ -94,7 +94,7 @@ class DeviceCloudPolicyManagerChromeOSTest chromeos::system::StatisticsProvider::SetTestProvider(NULL); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { DeviceSettingsTestBase::SetUp(); dbus_setter_->SetCryptohomeClient( scoped_ptr<chromeos::CryptohomeClient>(fake_cryptohome_client_)); @@ -130,7 +130,7 @@ class DeviceCloudPolicyManagerChromeOSTest "\"refresh_token\":\"refreshToken4Test\"}"; } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { manager_->Shutdown(); if (initializer_) initializer_->Shutdown(); @@ -309,7 +309,7 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest status_(EnrollmentStatus::ForStatus(EnrollmentStatus::STATUS_SUCCESS)), done_(false) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { DeviceCloudPolicyManagerChromeOSTest::SetUp(); // Set up test data. diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h index dea0277..8ad3c5b 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h +++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h @@ -40,8 +40,8 @@ class DeviceCloudPolicyStoreChromeOS // CloudPolicyStore: virtual void Store( - const enterprise_management::PolicyFetchResponse& policy) OVERRIDE; - virtual void Load() OVERRIDE; + const enterprise_management::PolicyFetchResponse& policy) override; + virtual void Load() override; // Installs initial policy. This is different from Store() in that it skips // the signature validation step against already-installed policy. The checks @@ -52,8 +52,8 @@ class DeviceCloudPolicyStoreChromeOS const enterprise_management::PolicyFetchResponse& policy); // chromeos::DeviceSettingsService::Observer: - virtual void OwnershipStatusChanged() OVERRIDE; - virtual void DeviceSettingsUpdated() OVERRIDE; + virtual void OwnershipStatusChanged() override; + virtual void DeviceSettingsUpdated() override; private: // Create a validator for |policy| with basic device policy configuration and diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc index acd1b98..e6e47a7 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc @@ -51,7 +51,7 @@ class DeviceCloudPolicyStoreChromeOSTest base::MessageLoopProxy::current())) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { DeviceSettingsTestBase::SetUp(); dbus_setter_->SetCryptohomeClient( diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc index 89e9898..55fe1f8 100644 --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc @@ -402,7 +402,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest, virtual ~DeviceLocalAccountTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Configure and start the test server. scoped_ptr<crypto::RSAPrivateKey> signing_key( PolicyBuilder::CreateTestSigningKey()); @@ -418,7 +418,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest, DevicePolicyCrosBrowserTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { DevicePolicyCrosBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(chromeos::switches::kLoginManager); command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); @@ -427,7 +427,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest, test_server_.GetServiceURL().spec()); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture(); // Clear command-line arguments (but keep command-line switches) so the @@ -444,7 +444,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest, InitializePolicy(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { DevicePolicyCrosBrowserTest::SetUpOnMainThread(); initial_locale_ = g_browser_process->GetApplicationLocale(); @@ -500,7 +500,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest, wizard_controller->SkipToLoginForTesting(LoginScreenContext()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { BrowserList::RemoveObserver(this); // This shuts down the login UI. @@ -510,22 +510,22 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest, } virtual void LocalStateChanged( - user_manager::UserManager* user_manager) OVERRIDE { + user_manager::UserManager* user_manager) override { if (run_loop_) run_loop_->Quit(); } - virtual void OnBrowserRemoved(Browser* browser) OVERRIDE { + virtual void OnBrowserRemoved(Browser* browser) override { if (run_loop_) run_loop_->Quit(); } - virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE { + virtual void OnAppWindowAdded(extensions::AppWindow* app_window) override { if (run_loop_) run_loop_->Quit(); } - virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE { + virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) override { if (run_loop_) run_loop_->Quit(); } diff --git a/chrome/browser/chromeos/policy/device_local_account_extension_tracker.h b/chrome/browser/chromeos/policy/device_local_account_extension_tracker.h index e985c4e..a357986e 100644 --- a/chrome/browser/chromeos/policy/device_local_account_extension_tracker.h +++ b/chrome/browser/chromeos/policy/device_local_account_extension_tracker.h @@ -26,8 +26,8 @@ class DeviceLocalAccountExtensionTracker : public CloudPolicyStore::Observer { virtual ~DeviceLocalAccountExtensionTracker(); // CloudPolicyStore::Observer: - virtual void OnStoreLoaded(CloudPolicyStore* store) OVERRIDE; - virtual void OnStoreError(CloudPolicyStore* store) OVERRIDE; + virtual void OnStoreLoaded(CloudPolicyStore* store) override; + virtual void OnStoreError(CloudPolicyStore* store) override; private: void UpdateFromStore(); diff --git a/chrome/browser/chromeos/policy/device_local_account_external_data_manager.h b/chrome/browser/chromeos/policy/device_local_account_external_data_manager.h index 473b937..626e09a 100644 --- a/chrome/browser/chromeos/policy/device_local_account_external_data_manager.h +++ b/chrome/browser/chromeos/policy/device_local_account_external_data_manager.h @@ -57,7 +57,7 @@ class DeviceLocalAccountExternalDataManager virtual ~DeviceLocalAccountExternalDataManager(); // CloudExternalDataManagerBase: - virtual void OnPolicyStoreLoaded() OVERRIDE; + virtual void OnPolicyStoreLoaded() override; DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountExternalDataManager); }; diff --git a/chrome/browser/chromeos/policy/device_local_account_external_data_service.h b/chrome/browser/chromeos/policy/device_local_account_external_data_service.h index 2174ef8..f825d5d 100644 --- a/chrome/browser/chromeos/policy/device_local_account_external_data_service.h +++ b/chrome/browser/chromeos/policy/device_local_account_external_data_service.h @@ -36,8 +36,8 @@ class DeviceLocalAccountExternalDataService virtual ~DeviceLocalAccountExternalDataService(); // DeviceLocalAccountPolicyService::Observer: - virtual void OnPolicyUpdated(const std::string& user_id) OVERRIDE; - virtual void OnDeviceLocalAccountsChanged() OVERRIDE; + virtual void OnPolicyUpdated(const std::string& user_id) override; + virtual void OnDeviceLocalAccountsChanged() override; scoped_refptr<DeviceLocalAccountExternalDataManager> GetExternalDataManager(const std::string& account_id, diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.h b/chrome/browser/chromeos/policy/device_local_account_policy_provider.h index 7807976..130c925 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.h +++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.h @@ -44,12 +44,12 @@ class DeviceLocalAccountPolicyProvider DeviceLocalAccountPolicyService* service); // ConfigurationPolicyProvider: - virtual bool IsInitializationComplete(PolicyDomain domain) const OVERRIDE; - virtual void RefreshPolicies() OVERRIDE; + virtual bool IsInitializationComplete(PolicyDomain domain) const override; + virtual void RefreshPolicies() override; // DeviceLocalAccountPolicyService::Observer: - virtual void OnPolicyUpdated(const std::string& user_id) OVERRIDE; - virtual void OnDeviceLocalAccountsChanged() OVERRIDE; + virtual void OnPolicyUpdated(const std::string& user_id) override; + virtual void OnDeviceLocalAccountsChanged() override; private: // Returns the broker for |user_id_| or NULL if not available. diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service.h b/chrome/browser/chromeos/policy/device_local_account_policy_service.h index 6643960..814437e 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_service.h +++ b/chrome/browser/chromeos/policy/device_local_account_policy_service.h @@ -104,11 +104,11 @@ class DeviceLocalAccountPolicyBroker std::string GetDisplayName() const; // CloudPolicyStore::Observer: - virtual void OnStoreLoaded(CloudPolicyStore* store) OVERRIDE; - virtual void OnStoreError(CloudPolicyStore* store) OVERRIDE; + virtual void OnStoreLoaded(CloudPolicyStore* store) override; + virtual void OnStoreError(CloudPolicyStore* store) override; // ComponentCloudPolicyService::Delegate: - virtual void OnComponentCloudPolicyUpdated() OVERRIDE; + virtual void OnComponentCloudPolicyUpdated() override; private: void CreateComponentCloudPolicyService( diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc index 6a86173..b9e81a4 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc @@ -81,8 +81,8 @@ class DeviceLocalAccountPolicyServiceTestBase public: DeviceLocalAccountPolicyServiceTestBase(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; void CreatePolicyService(); @@ -112,10 +112,10 @@ class DeviceLocalAccountPolicyServiceTest protected: DeviceLocalAccountPolicyServiceTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; - void InstallDevicePolicy() OVERRIDE; + void InstallDevicePolicy() override; MockDeviceLocalAccountPolicyServiceObserver service_observer_; @@ -493,7 +493,7 @@ class DeviceLocalAccountPolicyExtensionCacheTest protected: DeviceLocalAccountPolicyExtensionCacheTest(); - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; base::FilePath GetCacheDirectoryForAccountID(const std::string& account_id); @@ -772,8 +772,8 @@ class DeviceLocalAccountPolicyProviderTest protected: DeviceLocalAccountPolicyProviderTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; SchemaRegistry schema_registry_; scoped_ptr<DeviceLocalAccountPolicyProvider> provider_; diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_store.h b/chrome/browser/chromeos/policy/device_local_account_policy_store.h index d0e2192..80383d3 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_store.h +++ b/chrome/browser/chromeos/policy/device_local_account_policy_store.h @@ -49,8 +49,8 @@ class DeviceLocalAccountPolicyStore // CloudPolicyStore: virtual void Store( - const enterprise_management::PolicyFetchResponse& policy) OVERRIDE; - virtual void Load() OVERRIDE; + const enterprise_management::PolicyFetchResponse& policy) override; + virtual void Load() override; private: // Called back by |session_manager_client_| after policy retrieval. Checks for diff --git a/chrome/browser/chromeos/policy/device_network_configuration_updater.h b/chrome/browser/chromeos/policy/device_network_configuration_updater.h index bcf1dd2..b02b411 100644 --- a/chrome/browser/chromeos/policy/device_network_configuration_updater.h +++ b/chrome/browser/chromeos/policy/device_network_configuration_updater.h @@ -57,12 +57,12 @@ class DeviceNetworkConfigurationUpdater : public NetworkConfigurationUpdater { chromeos::NetworkDeviceHandler* network_device_handler, chromeos::CrosSettings* cros_settings); - virtual void Init() OVERRIDE; + virtual void Init() override; virtual void ImportCertificates(const base::ListValue& certificates_onc) - OVERRIDE; + override; virtual void ApplyNetworkPolicy(base::ListValue* network_configs_onc, base::DictionaryValue* global_network_config) - OVERRIDE; + override; void OnDataRoamingSettingChanged(); chromeos::NetworkDeviceHandler* network_device_handler_; diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h index 9ec7f82..03847dd 100644 --- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h +++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h @@ -47,8 +47,8 @@ class DevicePolicyCrosBrowserTest : public InProcessBrowserTest { DevicePolicyCrosBrowserTest(); virtual ~DevicePolicyCrosBrowserTest(); - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE; + virtual void SetUpInProcessBrowserTestFixture() override; + virtual void TearDownInProcessBrowserTestFixture() override; // Marks the device as enterprise-owned. Must be called to make device // policies apply Chrome-wide. If this is not called, device policies will diff --git a/chrome/browser/chromeos/policy/device_status_collector.h b/chrome/browser/chromeos/policy/device_status_collector.h index 7a77b0f..35e66a5 100644 --- a/chrome/browser/chromeos/policy/device_status_collector.h +++ b/chrome/browser/chromeos/policy/device_status_collector.h @@ -63,10 +63,10 @@ class DeviceStatusCollector : public CloudPolicyClient::StatusProvider { // CloudPolicyClient::StatusProvider: virtual bool GetDeviceStatus( - enterprise_management::DeviceStatusReportRequest* status) OVERRIDE; + enterprise_management::DeviceStatusReportRequest* status) override; virtual bool GetSessionStatus( - enterprise_management::SessionStatusReportRequest* status) OVERRIDE; - virtual void OnSubmittedSuccessfully() OVERRIDE; + enterprise_management::SessionStatusReportRequest* status) override; + virtual void OnSubmittedSuccessfully() override; static void RegisterPrefs(PrefRegistrySimple* registry); diff --git a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc index 9e1137d..6459fc9 100644 --- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc @@ -108,14 +108,14 @@ class TestingDeviceStatusCollector : public policy::DeviceStatusCollector { } protected: - virtual void CheckIdleState() OVERRIDE { + virtual void CheckIdleState() override { // This should never be called in testing, as it results in a dbus call. ADD_FAILURE(); } // Each time this is called, returns a time that is a fixed increment // later than the previous time. - virtual Time GetCurrentTime() OVERRIDE { + virtual Time GetCurrentTime() override { int poll_interval = policy::DeviceStatusCollector::kIdlePollIntervalSeconds; return baseline_time_ + TimeDelta::FromSeconds(poll_interval * baseline_offset_periods_++); @@ -191,7 +191,7 @@ class DeviceStatusCollectorTest : public testing::Test { cros_settings_->AddSettingsProvider(device_settings_provider_); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Disable network interface reporting since it requires additional setup. cros_settings_->SetBoolean(chromeos::kReportDeviceNetworkInterfaces, false); } @@ -708,7 +708,7 @@ static const FakeDeviceData kFakeDevices[] = { class DeviceStatusCollectorNetworkInterfacesTest : public DeviceStatusCollectorTest { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { chromeos::DBusThreadManager::Initialize(); chromeos::NetworkHandler::Initialize(); chromeos::ShillDeviceClient::TestInterface* test_device_client = @@ -740,7 +740,7 @@ class DeviceStatusCollectorNetworkInterfacesTest base::RunLoop().RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { chromeos::NetworkHandler::Shutdown(); chromeos::DBusThreadManager::Shutdown(); } diff --git a/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc b/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc index 397288e..e676c93 100644 --- a/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc @@ -25,12 +25,12 @@ class SystemUse24HourClockPolicyTest SystemUse24HourClockPolicyTest() { } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kLoginManager); command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { InstallOwnerKey(); MarkAsEnterpriseOwned(); DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture(); diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h index 71bd5fa..38cd1d5 100644 --- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h +++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h @@ -83,23 +83,23 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer, scoped_ptr<CloudPolicyClient> ReleaseClient(); // CloudPolicyClient::Observer: - virtual void OnPolicyFetched(CloudPolicyClient* client) OVERRIDE; - virtual void OnRegistrationStateChanged(CloudPolicyClient* client) OVERRIDE; - virtual void OnRobotAuthCodesFetched(CloudPolicyClient* client) OVERRIDE; - virtual void OnClientError(CloudPolicyClient* client) OVERRIDE; + virtual void OnPolicyFetched(CloudPolicyClient* client) override; + virtual void OnRegistrationStateChanged(CloudPolicyClient* client) override; + virtual void OnRobotAuthCodesFetched(CloudPolicyClient* client) override; + virtual void OnClientError(CloudPolicyClient* client) override; // CloudPolicyStore::Observer: - virtual void OnStoreLoaded(CloudPolicyStore* store) OVERRIDE; - virtual void OnStoreError(CloudPolicyStore* store) OVERRIDE; + virtual void OnStoreLoaded(CloudPolicyStore* store) override; + virtual void OnStoreError(CloudPolicyStore* store) override; // GaiaOAuthClient::Delegate: virtual void OnGetTokensResponse(const std::string& refresh_token, const std::string& access_token, - int expires_in_seconds) OVERRIDE; + int expires_in_seconds) override; virtual void OnRefreshTokenResponse(const std::string& access_token, - int expires_in_seconds) OVERRIDE; - virtual void OnOAuthError() OVERRIDE; - virtual void OnNetworkError(int response_code) OVERRIDE; + int expires_in_seconds) override; + virtual void OnOAuthError() override; + virtual void OnNetworkError(int response_code) override; private: // Indicates what step of the process is currently pending. These steps need diff --git a/chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc b/chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc index 9b66adb..5df7349 100644 --- a/chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc +++ b/chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc @@ -43,7 +43,7 @@ class EnterpriseInstallAttributesTest : public testing::Test { protected: EnterpriseInstallAttributesTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded( chromeos::FILE_INSTALL_ATTRIBUTES, GetTempPath(), true, false)); @@ -52,7 +52,7 @@ class EnterpriseInstallAttributesTest : public testing::Test { chromeos::DBusThreadManager::Get()->GetCryptohomeClient())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { chromeos::DBusThreadManager::Shutdown(); } diff --git a/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h b/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h index 7668713..396b852 100644 --- a/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h +++ b/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h @@ -21,8 +21,8 @@ class FakeDeviceCloudPolicyInitializer : public DeviceCloudPolicyInitializer { public: FakeDeviceCloudPolicyInitializer(); - virtual void Init() OVERRIDE; - virtual void Shutdown() OVERRIDE; + virtual void Init() override; + virtual void Shutdown() override; virtual void StartEnrollment( enterprise_management::PolicyData::ManagementMode management_mode, @@ -30,7 +30,7 @@ class FakeDeviceCloudPolicyInitializer : public DeviceCloudPolicyInitializer { const std::string& auth_token, bool is_auto_enrollment, const AllowedDeviceModes& allowed_modes, - const EnrollmentCallback& enrollment_callback) OVERRIDE; + const EnrollmentCallback& enrollment_callback) override; bool was_start_enrollment_called() { return was_start_enrollment_called_; diff --git a/chrome/browser/chromeos/policy/login_profile_policy_provider.h b/chrome/browser/chromeos/policy/login_profile_policy_provider.h index e8fbd91..6680394 100644 --- a/chrome/browser/chromeos/policy/login_profile_policy_provider.h +++ b/chrome/browser/chromeos/policy/login_profile_policy_provider.h @@ -24,15 +24,15 @@ class LoginProfilePolicyProvider : public ConfigurationPolicyProvider, virtual ~LoginProfilePolicyProvider(); // ConfigurationPolicyProvider: - virtual void Init(SchemaRegistry* registry) OVERRIDE; - virtual void Shutdown() OVERRIDE; - virtual void RefreshPolicies() OVERRIDE; + virtual void Init(SchemaRegistry* registry) override; + virtual void Shutdown() override; + virtual void RefreshPolicies() override; // PolicyService::Observer: virtual void OnPolicyUpdated(const PolicyNamespace& ns, const PolicyMap& previous, - const PolicyMap& current) OVERRIDE; - virtual void OnPolicyServiceInitialized(PolicyDomain domain) OVERRIDE; + const PolicyMap& current) override; + virtual void OnPolicyServiceInitialized(PolicyDomain domain) override; void OnDevicePolicyRefreshDone(); diff --git a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc index 3142f4e..4349e208 100644 --- a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc +++ b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc @@ -85,8 +85,8 @@ class LoginScreenDefaultPolicyBrowsertestBase virtual ~LoginScreenDefaultPolicyBrowsertestBase(); // DevicePolicyCrosBrowserTest: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpInProcessBrowserTestFixture() override; + virtual void SetUpOnMainThread() override; void RefreshDevicePolicyAndWaitForPrefChange(const char* pref_name); @@ -103,9 +103,9 @@ class LoginScreenDefaultPolicyLoginScreenBrowsertest virtual ~LoginScreenDefaultPolicyLoginScreenBrowsertest(); // LoginScreenDefaultPolicyBrowsertestBase: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; - virtual void TearDownOnMainThread() OVERRIDE; + virtual void SetUpCommandLine(CommandLine* command_line) override; + virtual void SetUpOnMainThread() override; + virtual void TearDownOnMainThread() override; void VerifyPrefFollowsRecommendation(const char* pref_name, const base::Value& recommended_value); @@ -121,7 +121,7 @@ class LoginScreenDefaultPolicyInSessionBrowsertest virtual ~LoginScreenDefaultPolicyInSessionBrowsertest(); // LoginScreenDefaultPolicyBrowsertestBase: - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpOnMainThread() override; void VerifyPrefFollowsDefault(const char* pref_name); diff --git a/chrome/browser/chromeos/policy/network_configuration_updater.h b/chrome/browser/chromeos/policy/network_configuration_updater.h index e4da21b..93d9674 100644 --- a/chrome/browser/chromeos/policy/network_configuration_updater.h +++ b/chrome/browser/chromeos/policy/network_configuration_updater.h @@ -40,8 +40,8 @@ class NetworkConfigurationUpdater : public PolicyService::Observer { // PolicyService::Observer overrides virtual void OnPolicyUpdated(const PolicyNamespace& ns, const PolicyMap& previous, - const PolicyMap& current) OVERRIDE; - virtual void OnPolicyServiceInitialized(PolicyDomain domain) OVERRIDE; + const PolicyMap& current) override; + virtual void OnPolicyServiceInitialized(PolicyDomain domain) override; protected: NetworkConfigurationUpdater( diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc index 2629ee4..0d508ed 100644 --- a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc +++ b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc @@ -60,7 +60,7 @@ class FakeUser : public user_manager::User { virtual ~FakeUser() {} // User overrides - virtual user_manager::UserType GetType() const OVERRIDE { + virtual user_manager::UserType GetType() const override { return user_manager::USER_TYPE_REGULAR; } @@ -74,7 +74,7 @@ class FakeWebTrustedCertsObserver FakeWebTrustedCertsObserver() {} virtual void OnTrustAnchorsChanged( - const net::CertificateList& trust_anchors) OVERRIDE { + const net::CertificateList& trust_anchors) override { trust_anchors_ = trust_anchors; } net::CertificateList trust_anchors_; @@ -87,7 +87,7 @@ class FakeNetworkDeviceHandler : public chromeos::FakeNetworkDeviceHandler { public: FakeNetworkDeviceHandler() : allow_roaming_(false) {} - virtual void SetCellularAllowRoaming(bool allow_roaming) OVERRIDE { + virtual void SetCellularAllowRoaming(bool allow_roaming) override { allow_roaming_ = allow_roaming; } @@ -124,7 +124,7 @@ class FakeCertificateImporter : public chromeos::onc::CertificateImporter { virtual void ImportCertificates(const base::ListValue& certificates, ::onc::ONCSource source, - const DoneCallback& done_callback) OVERRIDE { + const DoneCallback& done_callback) override { if (expected_onc_source_ != ::onc::ONC_SOURCE_UNKNOWN) EXPECT_EQ(expected_onc_source_, source); if (expected_onc_certificates_) { @@ -202,7 +202,7 @@ class NetworkConfigurationUpdaterTest : public testing::Test { protected: NetworkConfigurationUpdaterTest() : certificate_importer_(NULL) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EXPECT_CALL(provider_, IsInitializationComplete(_)) .WillRepeatedly(Return(false)); provider_.Init(); @@ -232,7 +232,7 @@ class NetworkConfigurationUpdaterTest : public testing::Test { certificate_importer_owned_.reset(certificate_importer_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { network_configuration_updater_.reset(); provider_.Shutdown(); base::RunLoop().RunUntilIdle(); diff --git a/chrome/browser/chromeos/policy/policy_cert_service.h b/chrome/browser/chromeos/policy/policy_cert_service.h index e32ca25..b014edf 100644 --- a/chrome/browser/chromeos/policy/policy_cert_service.h +++ b/chrome/browser/chromeos/policy/policy_cert_service.h @@ -56,10 +56,10 @@ class PolicyCertService // UserNetworkConfigurationUpdater::WebTrustedCertsObserver: virtual void OnTrustAnchorsChanged(const net::CertificateList& trust_anchors) - OVERRIDE; + override; // KeyedService: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; static scoped_ptr<PolicyCertService> CreateForTesting( const std::string& user_id, diff --git a/chrome/browser/chromeos/policy/policy_cert_service_factory.h b/chrome/browser/chromeos/policy/policy_cert_service_factory.h index b3c9d4e..6a5e50b 100644 --- a/chrome/browser/chromeos/policy/policy_cert_service_factory.h +++ b/chrome/browser/chromeos/policy/policy_cert_service_factory.h @@ -56,12 +56,12 @@ class PolicyCertServiceFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual void RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + user_prefs::PrefRegistrySyncable* registry) override; + virtual bool ServiceIsNULLWhileTesting() const override; DISALLOW_COPY_AND_ASSIGN(PolicyCertServiceFactory); }; diff --git a/chrome/browser/chromeos/policy/policy_cert_verifier.h b/chrome/browser/chromeos/policy/policy_cert_verifier.h index 6a2f0ff..a7f9b80 100644 --- a/chrome/browser/chromeos/policy/policy_cert_verifier.h +++ b/chrome/browser/chromeos/policy/policy_cert_verifier.h @@ -54,12 +54,12 @@ class PolicyCertVerifier : public net::CertVerifier, net::CertVerifyResult* verify_result, const net::CompletionCallback& callback, RequestHandle* out_req, - const net::BoundNetLog& net_log) OVERRIDE; + const net::BoundNetLog& net_log) override; - virtual void CancelRequest(RequestHandle req) OVERRIDE; + virtual void CancelRequest(RequestHandle req) override; // CertTrustAnchorProvider: - virtual const net::CertificateList& GetAdditionalTrustAnchors() OVERRIDE; + virtual const net::CertificateList& GetAdditionalTrustAnchors() override; private: net::CertificateList trust_anchors_; diff --git a/chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc b/chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc index 3196661d..46b64f4 100644 --- a/chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc +++ b/chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc @@ -34,7 +34,7 @@ class PolicyCertVerifierTest : public testing::Test { virtual ~PolicyCertVerifierTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(test_nss_user_.constructed_successfully()); test_nss_user_.FinishInit(); @@ -57,7 +57,7 @@ class PolicyCertVerifierTest : public testing::Test { test_ca_cert_list_.push_back(test_ca_cert_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Destroy |cert_verifier_| before destroying the ThreadBundle, otherwise // BrowserThread::CurrentlyOn checks fail. cert_verifier_.reset(); diff --git a/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h b/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h index a9ff26d..2fc2b2f 100644 --- a/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h +++ b/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h @@ -65,14 +65,14 @@ class PolicyOAuth2TokenFetcher private: // GaiaAuthConsumer overrides. virtual void OnClientOAuthSuccess( - const GaiaAuthConsumer::ClientOAuthResult& oauth_tokens) OVERRIDE; + const GaiaAuthConsumer::ClientOAuthResult& oauth_tokens) override; virtual void OnClientOAuthFailure( - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; // OAuth2AccessTokenConsumer overrides. virtual void OnGetTokenSuccess(const std::string& access_token, - const base::Time& expiration_time) OVERRIDE; - virtual void OnGetTokenFailure(const GoogleServiceAuthError& error) OVERRIDE; + const base::Time& expiration_time) override; + virtual void OnGetTokenFailure(const GoogleServiceAuthError& error) override; // Starts fetching OAuth2 refresh token. void StartFetchingRefreshToken(); diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc index feacbd1..022cd3d 100644 --- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc +++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc @@ -123,8 +123,8 @@ class PowerPolicyBrowserTestBase : public DevicePolicyCrosBrowserTest { PowerPolicyBrowserTestBase(); // DevicePolicyCrosBrowserTest: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpInProcessBrowserTestFixture() override; + virtual void SetUpOnMainThread() override; void InstallUserKey(); void StoreAndReloadUserPolicy(); @@ -155,9 +155,9 @@ class PowerPolicyLoginScreenBrowserTest : public PowerPolicyBrowserTestBase { PowerPolicyLoginScreenBrowserTest(); // PowerPolicyBrowserTestBase: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; - virtual void TearDownOnMainThread() OVERRIDE; + virtual void SetUpCommandLine(CommandLine* command_line) override; + virtual void SetUpOnMainThread() override; + virtual void TearDownOnMainThread() override; DISALLOW_COPY_AND_ASSIGN(PowerPolicyLoginScreenBrowserTest); }; @@ -167,7 +167,7 @@ class PowerPolicyInSessionBrowserTest : public PowerPolicyBrowserTestBase { PowerPolicyInSessionBrowserTest(); // PowerPolicyBrowserTestBase: - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpOnMainThread() override; DISALLOW_COPY_AND_ASSIGN(PowerPolicyInSessionBrowserTest); }; diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.h b/chrome/browser/chromeos/policy/recommendation_restorer.h index c81b06e..4e96c60 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer.h +++ b/chrome/browser/chromeos/policy/recommendation_restorer.h @@ -34,15 +34,15 @@ class RecommendationRestorer : public KeyedService, virtual ~RecommendationRestorer(); // KeyedService: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // wm::UserActivityObserver: - virtual void OnUserActivity(const ui::Event* event) OVERRIDE; + virtual void OnUserActivity(const ui::Event* event) override; // If a recommended value and a user setting exist for |pref_name|, clears the // user setting so that the recommended value can take effect. If diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_factory.h b/chrome/browser/chromeos/policy/recommendation_restorer_factory.h index 5d36fba..e137d0d 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer_factory.h +++ b/chrome/browser/chromeos/policy/recommendation_restorer_factory.h @@ -25,8 +25,8 @@ class RecommendationRestorerFactory : public BrowserContextKeyedServiceFactory { protected: // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; private: friend struct DefaultSingletonTraits<RecommendationRestorerFactory>; diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc index 03018ce..9875951 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc +++ b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc @@ -41,7 +41,7 @@ class RecommendationRestorerTest : public testing::Test { RecommendationRestorerTest(); // testing::Test: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; void RegisterUserProfilePrefs(); void RegisterLoginProfilePrefs(); diff --git a/chrome/browser/chromeos/policy/ticl_device_settings_provider.h b/chrome/browser/chromeos/policy/ticl_device_settings_provider.h index 9da8f27..85cf48e 100644 --- a/chrome/browser/chromeos/policy/ticl_device_settings_provider.h +++ b/chrome/browser/chromeos/policy/ticl_device_settings_provider.h @@ -19,7 +19,7 @@ class TiclDeviceSettingsProvider : public invalidation::TiclSettingsProvider { virtual ~TiclDeviceSettingsProvider(); // TiclInvalidationServiceSettingsProvider: - virtual bool UseGCMChannel() const OVERRIDE; + virtual bool UseGCMChannel() const override; private: DISALLOW_COPY_AND_ASSIGN(TiclDeviceSettingsProvider); diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h index 8e55eb5..c8e9fb4 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h @@ -90,23 +90,23 @@ class UserCloudPolicyManagerChromeOS : public CloudPolicyManager, void EnableWildcardLoginCheck(const std::string& username); // ConfigurationPolicyProvider: - virtual void Shutdown() OVERRIDE; - virtual bool IsInitializationComplete(PolicyDomain domain) const OVERRIDE; + virtual void Shutdown() override; + virtual bool IsInitializationComplete(PolicyDomain domain) const override; // CloudPolicyService::Observer: - virtual void OnInitializationCompleted(CloudPolicyService* service) OVERRIDE; + virtual void OnInitializationCompleted(CloudPolicyService* service) override; // CloudPolicyClient::Observer: - virtual void OnPolicyFetched(CloudPolicyClient* client) OVERRIDE; - virtual void OnRegistrationStateChanged(CloudPolicyClient* client) OVERRIDE; - virtual void OnClientError(CloudPolicyClient* client) OVERRIDE; + virtual void OnPolicyFetched(CloudPolicyClient* client) override; + virtual void OnRegistrationStateChanged(CloudPolicyClient* client) override; + virtual void OnClientError(CloudPolicyClient* client) override; // ComponentCloudPolicyService::Delegate: - virtual void OnComponentCloudPolicyUpdated() OVERRIDE; + virtual void OnComponentCloudPolicyUpdated() override; protected: // CloudPolicyManager: - virtual void GetChromePolicy(PolicyMap* policy_map) OVERRIDE; + virtual void GetChromePolicy(PolicyMap* policy_map) override; private: // Fetches a policy token using the authentication context of the signin diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc index 2ecec4c..e66780a 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc @@ -58,7 +58,7 @@ class UserCloudPolicyManagerTest : public chromeos::OobeBaseTest { virtual ~UserCloudPolicyManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); SetServerPolicy(); @@ -68,13 +68,13 @@ class UserCloudPolicyManagerTest : public chromeos::OobeBaseTest { OobeBaseTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII(policy::switches::kDeviceManagementUrl, test_server_->GetServiceURL().spec()); OobeBaseTest::SetUpCommandLine(command_line); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { SetMergeSessionParams(kAccountId); SetupGaiaServerWithAccessTokens(); OobeBaseTest::SetUpOnMainThread(); diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc index 4490749..087b82a 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc @@ -82,7 +82,7 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test { profile_(NULL), signin_profile_(NULL) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // The initialization path that blocks on the initial policy fetch requires // a signin Profile to use its URLRequestContext. profile_manager_.reset( @@ -144,7 +144,7 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test { .Times(AnyNumber()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (token_forwarder_) token_forwarder_->Shutdown(); if (manager_) { diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h index e1cf16f..077daf9 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h @@ -76,13 +76,13 @@ class UserCloudPolicyManagerFactoryChromeOS // BrowserContextKeyedBaseFactory: virtual void BrowserContextShutdown( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual void BrowserContextDestroyed( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual void SetEmptyTestingFactory( - content::BrowserContext* context) OVERRIDE; - virtual bool HasTestingFactory(content::BrowserContext* context) OVERRIDE; - virtual void CreateServiceNow(content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; + virtual bool HasTestingFactory(content::BrowserContext* context) override; + virtual void CreateServiceNow(content::BrowserContext* context) override; typedef std::map<Profile*, UserCloudPolicyManagerChromeOS*> ManagerMap; ManagerMap managers_; diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc index 2f2f86f..f252624 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc @@ -76,12 +76,12 @@ class LegacyPolicyCacheLoader : public UserPolicyTokenLoader::Delegate, // UserPolicyTokenLoader::Delegate: virtual void OnTokenLoaded(const std::string& token, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; // UserPolicyDiskCache::Delegate: virtual void OnDiskCacheLoaded( UserPolicyDiskCache::LoadResult result, - const em::CachedCloudPolicyResponse& policy) OVERRIDE; + const em::CachedCloudPolicyResponse& policy) override; private: // Checks whether the load operations from the legacy caches completed. If so, diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h index 65d3832..07805d9 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h @@ -52,8 +52,8 @@ class UserCloudPolicyStoreChromeOS : public UserCloudPolicyStoreBase { // CloudPolicyStore: virtual void Store( - const enterprise_management::PolicyFetchResponse& policy) OVERRIDE; - virtual void Load() OVERRIDE; + const enterprise_management::PolicyFetchResponse& policy) override; + virtual void Load() override; // Loads the policy synchronously on the current thread. void LoadImmediately(); diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc index f695148..a1d834f 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc @@ -54,7 +54,7 @@ class UserCloudPolicyStoreChromeOSTest : public testing::Test { protected: UserCloudPolicyStoreChromeOSTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EXPECT_CALL(cryptohome_client_, GetSanitizedUsername(PolicyBuilder::kFakeUsername, _)) .Times(AnyNumber()) @@ -82,7 +82,7 @@ class UserCloudPolicyStoreChromeOSTest : public testing::Test { policy_.Build(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { store_->RemoveObserver(&observer_); store_.reset(); RunUntilIdle(); diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h index 04148d8..76f322b 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h @@ -36,20 +36,20 @@ class UserCloudPolicyTokenForwarder : public KeyedService, virtual ~UserCloudPolicyTokenForwarder(); // KeyedService: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // OAuth2TokenService::Observer: - virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE; + virtual void OnRefreshTokenAvailable(const std::string& account_id) override; // OAuth2TokenService::Consumer: virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request, const std::string& access_token, - const base::Time& expiration_time) OVERRIDE; + const base::Time& expiration_time) override; virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request, - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; // CloudPolicyService::Observer: - virtual void OnInitializationCompleted(CloudPolicyService* service) OVERRIDE; + virtual void OnInitializationCompleted(CloudPolicyService* service) override; private: void Initialize(); diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h index b138507..5f62067 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h @@ -31,9 +31,9 @@ class UserCloudPolicyTokenForwarderFactory // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyTokenForwarderFactory); }; diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater.h b/chrome/browser/chromeos/policy/user_network_configuration_updater.h index b851242..3c85009 100644 --- a/chrome/browser/chromeos/policy/user_network_configuration_updater.h +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater.h @@ -102,16 +102,16 @@ class UserNetworkConfigurationUpdater : public NetworkConfigurationUpdater, // NetworkConfigurationUpdater: virtual void ImportCertificates( - const base::ListValue& certificates_onc) OVERRIDE; + const base::ListValue& certificates_onc) override; virtual void ApplyNetworkPolicy( base::ListValue* network_configs_onc, - base::DictionaryValue* global_network_config) OVERRIDE; + base::DictionaryValue* global_network_config) override; // content::NotificationObserver implementation. Observes the profile to which // |this| belongs to for PROFILE_ADDED notification. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Creates onc::CertImporter with |database| and passes it to // |SetCertificateImporter|. diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h index 52257b9..ab1c2fe 100644 --- a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h @@ -37,11 +37,11 @@ class UserNetworkConfigurationUpdaterFactory // BrowserContextKeyedServiceFactory: virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; DISALLOW_COPY_AND_ASSIGN(UserNetworkConfigurationUpdaterFactory); }; diff --git a/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc b/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc index 86c6a70..c8eba3d 100644 --- a/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc +++ b/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc @@ -17,7 +17,7 @@ class VariationsServiceDevicePolicyTest : public DevicePolicyCrosBrowserTest { protected: VariationsServiceDevicePolicyTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture(); InstallOwnerKey(); diff --git a/chrome/browser/chromeos/policy/wildcard_login_checker.h b/chrome/browser/chromeos/policy/wildcard_login_checker.h index 358788d..d3ca9a4 100644 --- a/chrome/browser/chromeos/policy/wildcard_login_checker.h +++ b/chrome/browser/chromeos/policy/wildcard_login_checker.h @@ -47,9 +47,9 @@ class WildcardLoginChecker : public UserInfoFetcher::Delegate { // UserInfoFetcher::Delegate: virtual void OnGetUserInfoSuccess(const base::DictionaryValue* response) - OVERRIDE; + override; virtual void OnGetUserInfoFailure(const GoogleServiceAuthError& error) - OVERRIDE; + override; private: // Starts the check after successful token minting. diff --git a/chrome/browser/chromeos/power/freezer_cgroup_process_manager.h b/chrome/browser/chromeos/power/freezer_cgroup_process_manager.h index 7f1b215..2cf095c 100644 --- a/chrome/browser/chromeos/power/freezer_cgroup_process_manager.h +++ b/chrome/browser/chromeos/power/freezer_cgroup_process_manager.h @@ -18,9 +18,9 @@ class FreezerCgroupProcessManager : public RendererFreezer::Delegate { virtual ~FreezerCgroupProcessManager(); // RendererFreezer::Delegate overrides. - virtual bool FreezeRenderers() OVERRIDE; - virtual bool ThawRenderers() OVERRIDE; - virtual bool CanFreezeRenderers() OVERRIDE; + virtual bool FreezeRenderers() override; + virtual bool ThawRenderers() override; + virtual bool CanFreezeRenderers() override; private: bool WriteCommandToStateFile(const std::string& command); diff --git a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc index 57ff402..5217006 100644 --- a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc +++ b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc @@ -35,7 +35,7 @@ class FixedWidthLabel : public views::Label { explicit FixedWidthLabel(int width); virtual ~FixedWidthLabel(); - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; private: int width_; diff --git a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.h b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.h index 694748b..0b3aa6d 100644 --- a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.h +++ b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.h @@ -28,10 +28,10 @@ class IdleActionWarningDialogView : public views::DialogDelegateView { void Update(base::TimeTicks idle_action_time); // views::DialogDelegateView: - virtual ui::ModalType GetModalType() const OVERRIDE; - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual int GetDialogButtons() const OVERRIDE; - virtual bool Cancel() OVERRIDE; + virtual ui::ModalType GetModalType() const override; + virtual base::string16 GetWindowTitle() const override; + virtual int GetDialogButtons() const override; + virtual bool Cancel() override; private: virtual ~IdleActionWarningDialogView(); diff --git a/chrome/browser/chromeos/power/idle_action_warning_observer.h b/chrome/browser/chromeos/power/idle_action_warning_observer.h index 81deecf..1e24be0 100644 --- a/chrome/browser/chromeos/power/idle_action_warning_observer.h +++ b/chrome/browser/chromeos/power/idle_action_warning_observer.h @@ -22,8 +22,8 @@ class IdleActionWarningObserver : public PowerManagerClient::Observer { // PowerManagerClient::Observer: virtual void IdleActionImminent( - const base::TimeDelta& time_until_idle_action) OVERRIDE; - virtual void IdleActionDeferred() OVERRIDE; + const base::TimeDelta& time_until_idle_action) override; + virtual void IdleActionDeferred() override; private: IdleActionWarningDialogView* warning_dialog_; // Not owned. diff --git a/chrome/browser/chromeos/power/light_bar.h b/chrome/browser/chromeos/power/light_bar.h index b5968876..56f7676 100644 --- a/chrome/browser/chromeos/power/light_bar.h +++ b/chrome/browser/chromeos/power/light_bar.h @@ -19,7 +19,7 @@ class CHROMEOS_EXPORT LightBar : public PowerManagerClient::Observer { virtual ~LightBar(); // PowerManagerClient::Observer implementation. - virtual void DarkSuspendImminent() OVERRIDE; + virtual void DarkSuspendImminent() override; private: // Path to control the light bar. diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer.cc b/chrome/browser/chromeos/power/peripheral_battery_observer.cc index 5e4a7f3..d3f99c1 100644 --- a/chrome/browser/chromeos/power/peripheral_battery_observer.cc +++ b/chrome/browser/chromeos/power/peripheral_battery_observer.cc @@ -74,14 +74,14 @@ class PeripheralBatteryNotificationDelegate : public NotificationDelegate { : id_(id) {} // Overridden from NotificationDelegate: - virtual void Display() OVERRIDE {} - virtual void Error() OVERRIDE {} - virtual void Close(bool by_user) OVERRIDE {} - virtual void Click() OVERRIDE {} - virtual std::string id() const OVERRIDE { return id_; } + virtual void Display() override {} + virtual void Error() override {} + virtual void Close(bool by_user) override {} + virtual void Click() override {} + virtual std::string id() const override { return id_; } // A NULL return value prevents loading image from URL. It is OK since our // implementation loads image from system resource bundle. - virtual content::WebContents* GetWebContents() const OVERRIDE { + virtual content::WebContents* GetWebContents() const override { return NULL; } diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer.h b/chrome/browser/chromeos/power/peripheral_battery_observer.h index 0e958be..189c13c 100644 --- a/chrome/browser/chromeos/power/peripheral_battery_observer.h +++ b/chrome/browser/chromeos/power/peripheral_battery_observer.h @@ -36,13 +36,13 @@ class PeripheralBatteryObserver : public PowerManagerClient::Observer, // PowerManagerClient::Observer implementation. virtual void PeripheralBatteryStatusReceived(const std::string& path, const std::string& name, - int level) OVERRIDE; + int level) override; // device::BluetoothAdapter::Observer implementation. virtual void DeviceChanged(device::BluetoothAdapter* adapter, - device::BluetoothDevice* device) OVERRIDE; + device::BluetoothDevice* device) override; virtual void DeviceRemoved(device::BluetoothAdapter* adapter, - device::BluetoothDevice* device) OVERRIDE; + device::BluetoothDevice* device) override; private: friend class PeripheralBatteryObserverTest; diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc index 8d93dbf..24d8d47 100644 --- a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc +++ b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc @@ -34,23 +34,23 @@ class PeripheralBatteryObserverTest : public InProcessBrowserTest { PeripheralBatteryObserverTest() {} virtual ~PeripheralBatteryObserverTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { chromeos::DBusThreadManager::Initialize(); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { observer_.reset(new PeripheralBatteryObserver()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { observer_.reset(); } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { InProcessBrowserTest::TearDownInProcessBrowserTestFixture(); } diff --git a/chrome/browser/chromeos/power/power_button_observer.h b/chrome/browser/chromeos/power/power_button_observer.h index 91c8db5..8a22d2f 100644 --- a/chrome/browser/chromeos/power/power_button_observer.h +++ b/chrome/browser/chromeos/power/power_button_observer.h @@ -28,11 +28,11 @@ class PowerButtonObserver : public content::NotificationObserver, // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // PowerManagerObserver implementation: virtual void PowerButtonEventReceived( - bool down, const base::TimeTicks& timestamp) OVERRIDE; + bool down, const base::TimeTicks& timestamp) override; content::NotificationRegistrar registrar_; diff --git a/chrome/browser/chromeos/power/power_data_collector.h b/chrome/browser/chromeos/power/power_data_collector.h index 436361d..31f77e0 100644 --- a/chrome/browser/chromeos/power/power_data_collector.h +++ b/chrome/browser/chromeos/power/power_data_collector.h @@ -83,8 +83,8 @@ class CHROMEOS_EXPORT PowerDataCollector : public PowerManagerClient::Observer { // PowerManagerClient::Observer implementation: virtual void PowerChanged( - const power_manager::PowerSupplyProperties& prop) OVERRIDE; - virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE; + const power_manager::PowerSupplyProperties& prop) override; + virtual void SuspendDone(const base::TimeDelta& sleep_duration) override; // Only those power data samples which fall within the last // |kSampleTimeLimitSec| are stored in memory. diff --git a/chrome/browser/chromeos/power/power_data_collector_unittest.cc b/chrome/browser/chromeos/power/power_data_collector_unittest.cc index db2df82..035edf3 100644 --- a/chrome/browser/chromeos/power/power_data_collector_unittest.cc +++ b/chrome/browser/chromeos/power/power_data_collector_unittest.cc @@ -14,13 +14,13 @@ class PowerDataCollectorTest : public testing::Test { PowerDataCollectorTest() : power_data_collector_(NULL) {} virtual ~PowerDataCollectorTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { DBusThreadManager::Initialize(); PowerDataCollector::InitializeForTesting(); power_data_collector_ = PowerDataCollector::Get(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { PowerDataCollector::Shutdown(); DBusThreadManager::Shutdown(); power_data_collector_ = NULL; diff --git a/chrome/browser/chromeos/power/power_prefs.h b/chrome/browser/chromeos/power/power_prefs.h index db2c82f..1e037ce 100644 --- a/chrome/browser/chromeos/power/power_prefs.h +++ b/chrome/browser/chromeos/power/power_prefs.h @@ -40,7 +40,7 @@ class PowerPrefs : public content::NotificationObserver { // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; void UpdatePowerPolicyFromPrefs(); diff --git a/chrome/browser/chromeos/power/power_prefs_unittest.cc b/chrome/browser/chromeos/power/power_prefs_unittest.cc index 4a46b491..cb0041f 100644 --- a/chrome/browser/chromeos/power/power_prefs_unittest.cc +++ b/chrome/browser/chromeos/power/power_prefs_unittest.cc @@ -43,8 +43,8 @@ class PowerPrefsTest : public testing::Test { PowerPrefsTest(); // testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; const Profile* GetProfile() const; diff --git a/chrome/browser/chromeos/power/renderer_freezer.h b/chrome/browser/chromeos/power/renderer_freezer.h index 7b80100..d5ac6f9 100644 --- a/chrome/browser/chromeos/power/renderer_freezer.h +++ b/chrome/browser/chromeos/power/renderer_freezer.h @@ -42,8 +42,8 @@ class CHROMEOS_EXPORT RendererFreezer : public PowerManagerClient::Observer { virtual ~RendererFreezer(); // PowerManagerClient::Observer implementation - virtual void SuspendImminent() OVERRIDE; - virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE; + virtual void SuspendImminent() override; + virtual void SuspendDone(const base::TimeDelta& sleep_duration) override; private: // Called when all asynchronous work is complete and renderers can be frozen. diff --git a/chrome/browser/chromeos/power/renderer_freezer_unittest.cc b/chrome/browser/chromeos/power/renderer_freezer_unittest.cc index 7388fdf6..ec809ca 100644 --- a/chrome/browser/chromeos/power/renderer_freezer_unittest.cc +++ b/chrome/browser/chromeos/power/renderer_freezer_unittest.cc @@ -65,17 +65,17 @@ class TestDelegate : public RendererFreezer::Delegate, public ActionRecorder { virtual ~TestDelegate() {} // RendererFreezer::Delegate overrides. - virtual bool FreezeRenderers() OVERRIDE { + virtual bool FreezeRenderers() override { AppendAction(kFreezeRenderers); return freeze_renderers_result_; } - virtual bool ThawRenderers() OVERRIDE { + virtual bool ThawRenderers() override { AppendAction(kThawRenderers); return thaw_renderers_result_; } - virtual bool CanFreezeRenderers() OVERRIDE { return can_freeze_renderers_; } + virtual bool CanFreezeRenderers() override { return can_freeze_renderers_; } void set_freeze_renderers_result(bool result) { freeze_renderers_result_ = result; diff --git a/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h b/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h index c7d0845..fc2086c 100644 --- a/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h +++ b/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h @@ -19,8 +19,8 @@ class SessionStateControllerDelegateChromeos private: // SessionStateControllerDelegate implementation. - virtual void RequestLockScreen() OVERRIDE; - virtual void RequestShutdown() OVERRIDE; + virtual void RequestLockScreen() override; + virtual void RequestShutdown() override; DISALLOW_COPY_AND_ASSIGN(SessionStateControllerDelegateChromeos); }; diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h index df2a9b9..ab6fd3c 100644 --- a/chrome/browser/chromeos/preferences.h +++ b/chrome/browser/chromeos/preferences.h @@ -101,14 +101,14 @@ class Preferences : public PrefServiceSyncableObserver, void ForceNaturalScrollDefault(); // PrefServiceSyncableObserver implementation. - virtual void OnIsSyncingChanged() OVERRIDE; + virtual void OnIsSyncingChanged() override; // Overriden from ash::ShellObserver. - virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE; + virtual void OnTouchHudProjectionToggled(bool enabled) override; // Overriden form user_manager::UserManager::UserSessionStateObserver. virtual void ActiveUserChanged( - const user_manager::User* active_user) OVERRIDE; + const user_manager::User* active_user) override; void ActivateInputMethods(const user_manager::User* active_user); diff --git a/chrome/browser/chromeos/preferences_browsertest.cc b/chrome/browser/chromeos/preferences_browsertest.cc index 24dd08d..bf12c33 100644 --- a/chrome/browser/chromeos/preferences_browsertest.cc +++ b/chrome/browser/chromeos/preferences_browsertest.cc @@ -43,12 +43,12 @@ class PreferencesTest : public LoginManagerTest { input_settings_(NULL), keyboard_(NULL) {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { LoginManagerTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kStubCrosSettings); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { LoginManagerTest::SetUpOnMainThread(); input_settings_ = new system::FakeInputDeviceSettings(); system::InputDeviceSettings::SetSettingsForTesting(input_settings_); diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc index b5e682b..194b303 100644 --- a/chrome/browser/chromeos/preferences_unittest.cc +++ b/chrome/browser/chromeos/preferences_unittest.cc @@ -25,7 +25,7 @@ class MyMockInputMethodManager : public input_method::MockInputMethodManager { : MockInputMethodManager::State(manager), manager_(manager) {}; virtual void ChangeInputMethod(const std::string& input_method_id, - bool show_message) OVERRIDE { + bool show_message) override { manager_->last_input_method_id_ = input_method_id; // Do the same thing as BrowserStateMonitor::UpdateUserPreferences. const std::string current_input_method_on_pref = diff --git a/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.h b/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.h index 9de0bba..63b9a32 100644 --- a/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.h +++ b/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.h @@ -20,11 +20,11 @@ class AvatarMenuActionsChromeOS : public AvatarMenuActions { virtual ~AvatarMenuActionsChromeOS(); // AvatarMenuActions overrides: - virtual void AddNewProfile(ProfileMetrics::ProfileAdd type) OVERRIDE; - virtual void EditProfile(Profile* profile, size_t index) OVERRIDE; - virtual bool ShouldShowAddNewProfileLink() const OVERRIDE; - virtual bool ShouldShowEditProfileLink() const OVERRIDE; - virtual void ActiveBrowserChanged(Browser* browser) OVERRIDE; + virtual void AddNewProfile(ProfileMetrics::ProfileAdd type) override; + virtual void EditProfile(Profile* profile, size_t index) override; + virtual bool ShouldShowAddNewProfileLink() const override; + virtual bool ShouldShowEditProfileLink() const override; + virtual void ActiveBrowserChanged(Browser* browser) override; private: // Browser in which this avatar menu resides. Weak. diff --git a/chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.cc b/chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.cc index bdd8086..3851bf5 100644 --- a/chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.cc +++ b/chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.cc @@ -37,13 +37,13 @@ class MultiprofilesIntroView : public views::DialogDelegateView { static void ShowDialog(const base::Callback<void(bool)> on_accept); // views::DialogDelegate overrides. - virtual bool Accept() OVERRIDE; + virtual bool Accept() override; // views::WidgetDelegate overrides. - virtual ui::ModalType GetModalType() const OVERRIDE; + virtual ui::ModalType GetModalType() const override; // views::View overrides. - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; private: void InitDialog(); diff --git a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc index f8a37b3..d4bf056 100644 --- a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc +++ b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc @@ -38,16 +38,16 @@ class MultiprofilesSessionAbortedView : public views::DialogDelegateView { static void ShowDialog(const std::string& user_email); // views::DialogDelegate overrides. - virtual bool Accept() OVERRIDE; - virtual int GetDialogButtons() const OVERRIDE; + virtual bool Accept() override; + virtual int GetDialogButtons() const override; virtual base::string16 GetDialogButtonLabel( - ui::DialogButton button) const OVERRIDE; + ui::DialogButton button) const override; // views::WidgetDelegate overrides. - virtual ui::ModalType GetModalType() const OVERRIDE; + virtual ui::ModalType GetModalType() const override; // views::View overrides. - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; private: void InitDialog(const std::string& user_email); diff --git a/chrome/browser/chromeos/profiles/profile_helper.h b/chrome/browser/chromeos/profiles/profile_helper.h index e6b99db..7d8f831 100644 --- a/chrome/browser/chromeos/profiles/profile_helper.h +++ b/chrome/browser/chromeos/profiles/profile_helper.h @@ -135,15 +135,15 @@ class ProfileHelper friend class SessionStateDelegateChromeOSTest; // BrowsingDataRemover::Observer implementation: - virtual void OnBrowsingDataRemoverDone() OVERRIDE; + virtual void OnBrowsingDataRemoverDone() override; // OAuth2LoginManager::Observer overrides. virtual void OnSessionRestoreStateChanged( Profile* user_profile, - OAuth2LoginManager::SessionRestoreState state) OVERRIDE; + OAuth2LoginManager::SessionRestoreState state) override; // user_manager::UserManager::UserSessionStateObserver implementation: - virtual void ActiveUserHashChanged(const std::string& hash) OVERRIDE; + virtual void ActiveUserHashChanged(const std::string& hash) override; // Associates |user| with profile with the same user_id, // for GetUserByProfile() testing. diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos.h b/chrome/browser/chromeos/profiles/profile_list_chromeos.h index 31f8f40..7e85877 100644 --- a/chrome/browser/chromeos/profiles/profile_list_chromeos.h +++ b/chrome/browser/chromeos/profiles/profile_list_chromeos.h @@ -20,11 +20,11 @@ class ProfileListChromeOS : public ProfileList { virtual ~ProfileListChromeOS(); // ProfileList overrides: - virtual size_t GetNumberOfItems() const OVERRIDE; - virtual const AvatarMenu::Item& GetItemAt(size_t index) const OVERRIDE; - virtual void RebuildMenu() OVERRIDE; - virtual size_t MenuIndexFromProfileIndex(size_t index) OVERRIDE; - virtual void ActiveProfilePathChanged(base::FilePath& path) OVERRIDE; + virtual size_t GetNumberOfItems() const override; + virtual const AvatarMenu::Item& GetItemAt(size_t index) const override; + virtual void RebuildMenu() override; + virtual size_t MenuIndexFromProfileIndex(size_t index) override; + virtual void ActiveProfilePathChanged(base::FilePath& path) override; private: void ClearMenu(); diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc index 233890c..93c21f7 100644 --- a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc +++ b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc @@ -33,7 +33,7 @@ class MockObserver : public AvatarMenuObserver { virtual ~MockObserver() {} virtual void OnAvatarMenuChanged( - AvatarMenu* avatar_menu) OVERRIDE { + AvatarMenu* avatar_menu) override { ++count_; } diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h index 81ec9e2..7b87cd6 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.h +++ b/chrome/browser/chromeos/proxy_config_service_impl.h @@ -48,10 +48,10 @@ class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl, // PrefProxyConfigTrackerImpl implementation. virtual void OnProxyConfigChanged(ProxyPrefs::ConfigState config_state, - const net::ProxyConfig& config) OVERRIDE; + const net::ProxyConfig& config) override; // NetworkStateHandlerObserver implementation. - virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE; + virtual void DefaultNetworkChanged(const NetworkState* network) override; protected: friend class UIProxyConfigService; diff --git a/chrome/browser/chromeos/session_length_limiter.cc b/chrome/browser/chromeos/session_length_limiter.cc index 4ba632a..63e0b12 100644 --- a/chrome/browser/chromeos/session_length_limiter.cc +++ b/chrome/browser/chromeos/session_length_limiter.cc @@ -37,8 +37,8 @@ class SessionLengthLimiterDelegateImpl : public SessionLengthLimiter::Delegate { SessionLengthLimiterDelegateImpl(); virtual ~SessionLengthLimiterDelegateImpl(); - virtual const base::TimeTicks GetCurrentTime() const OVERRIDE; - virtual void StopSession() OVERRIDE; + virtual const base::TimeTicks GetCurrentTime() const override; + virtual void StopSession() override; private: DISALLOW_COPY_AND_ASSIGN(SessionLengthLimiterDelegateImpl); diff --git a/chrome/browser/chromeos/session_length_limiter.h b/chrome/browser/chromeos/session_length_limiter.h index f809454..133319d 100644 --- a/chrome/browser/chromeos/session_length_limiter.h +++ b/chrome/browser/chromeos/session_length_limiter.h @@ -38,7 +38,7 @@ class SessionLengthLimiter : public wm::UserActivityObserver { virtual ~SessionLengthLimiter(); // wm::UserActivityObserver: - virtual void OnUserActivity(const ui::Event* event) OVERRIDE; + virtual void OnUserActivity(const ui::Event* event) override; private: // Attempt to restore the session start time and the flag indicating user diff --git a/chrome/browser/chromeos/session_length_limiter_unittest.cc b/chrome/browser/chromeos/session_length_limiter_unittest.cc index eec7d95..60252e3 100644 --- a/chrome/browser/chromeos/session_length_limiter_unittest.cc +++ b/chrome/browser/chromeos/session_length_limiter_unittest.cc @@ -45,14 +45,14 @@ class MockTimeSingleThreadTaskRunner : public base::SingleThreadTaskRunner { MockTimeSingleThreadTaskRunner(); // base::SingleThreadTaskRunner: - virtual bool RunsTasksOnCurrentThread() const OVERRIDE; + virtual bool RunsTasksOnCurrentThread() const override; virtual bool PostDelayedTask(const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE; + base::TimeDelta delay) override; virtual bool PostNonNestableDelayedTask( const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE; + base::TimeDelta delay) override; const base::TimeTicks& GetCurrentTime() const; @@ -83,8 +83,8 @@ class SessionLengthLimiterTest : public testing::Test { SessionLengthLimiterTest(); // testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; void SetSessionUserActivitySeenPref(bool user_activity_seen); void ClearSessionUserActivitySeenPref(); diff --git a/chrome/browser/chromeos/set_time_dialog.h b/chrome/browser/chromeos/set_time_dialog.h index 11cf4b6..71bee75 100644 --- a/chrome/browser/chromeos/set_time_dialog.h +++ b/chrome/browser/chromeos/set_time_dialog.h @@ -24,19 +24,19 @@ class SetTimeDialog : public ui::WebDialogDelegate { private: // ui::WebDialogDelegate: - virtual ui::ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ui::ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const override; + virtual void GetDialogSize(gfx::Size* size) const override; + virtual std::string GetDialogArgs() const override; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnCloseContents(content::WebContents* source, - bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; virtual bool HandleContextMenu( - const content::ContextMenuParams& params) OVERRIDE; + const content::ContextMenuParams& params) override; DISALLOW_COPY_AND_ASSIGN(SetTimeDialog); }; diff --git a/chrome/browser/chromeos/settings/cros_settings_unittest.cc b/chrome/browser/chromeos/settings/cros_settings_unittest.cc index 0bbe573..936041d 100644 --- a/chrome/browser/chromeos/settings/cros_settings_unittest.cc +++ b/chrome/browser/chromeos/settings/cros_settings_unittest.cc @@ -37,7 +37,7 @@ class CrosSettingsTest : public testing::Test { virtual ~CrosSettingsTest() {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ASSERT_TRUE(expected_props_.empty()); STLDeleteValues(&expected_props_); expected_props_.clear(); diff --git a/chrome/browser/chromeos/settings/device_identity_provider.h b/chrome/browser/chromeos/settings/device_identity_provider.h index 8007574..2099fc33f 100644 --- a/chrome/browser/chromeos/settings/device_identity_provider.h +++ b/chrome/browser/chromeos/settings/device_identity_provider.h @@ -20,10 +20,10 @@ class DeviceIdentityProvider : public IdentityProvider { virtual ~DeviceIdentityProvider(); // IdentityProvider: - virtual std::string GetActiveUsername() OVERRIDE; - virtual std::string GetActiveAccountId() OVERRIDE; - virtual OAuth2TokenService* GetTokenService() OVERRIDE; - virtual bool RequestLogin() OVERRIDE; + virtual std::string GetActiveUsername() override; + virtual std::string GetActiveAccountId() override; + virtual OAuth2TokenService* GetTokenService() override; + virtual bool RequestLogin() override; private: chromeos::DeviceOAuth2TokenService* token_service_; diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service.h b/chrome/browser/chromeos/settings/device_oauth2_token_service.h index f315554..dab3170 100644 --- a/chrome/browser/chromeos/settings/device_oauth2_token_service.h +++ b/chrome/browser/chromeos/settings/device_oauth2_token_service.h @@ -57,32 +57,32 @@ class DeviceOAuth2TokenService : public OAuth2TokenService, // Implementation of OAuth2TokenService. virtual bool RefreshTokenIsAvailable(const std::string& account_id) - const OVERRIDE; + const override; // Pull the robot account ID from device policy. virtual std::string GetRobotAccountId() const; // gaia::GaiaOAuthClient::Delegate implementation. virtual void OnRefreshTokenResponse(const std::string& access_token, - int expires_in_seconds) OVERRIDE; + int expires_in_seconds) override; virtual void OnGetTokenInfoResponse( - scoped_ptr<base::DictionaryValue> token_info) OVERRIDE; - virtual void OnOAuthError() OVERRIDE; - virtual void OnNetworkError(int response_code) OVERRIDE; + scoped_ptr<base::DictionaryValue> token_info) override; + virtual void OnOAuthError() override; + virtual void OnNetworkError(int response_code) override; protected: // Implementation of OAuth2TokenService. - virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE; + virtual net::URLRequestContextGetter* GetRequestContext() override; virtual void FetchOAuth2Token(RequestImpl* request, const std::string& account_id, net::URLRequestContextGetter* getter, const std::string& client_id, const std::string& client_secret, - const ScopeSet& scopes) OVERRIDE; + const ScopeSet& scopes) override; virtual OAuth2AccessTokenFetcher* CreateAccessTokenFetcher( const std::string& account_id, net::URLRequestContextGetter* getter, - OAuth2AccessTokenConsumer* consumer) OVERRIDE; + OAuth2AccessTokenConsumer* consumer) override; private: struct PendingRequest; diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc index cd14140..a75754e 100644 --- a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc +++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc @@ -74,7 +74,7 @@ class DeviceOAuth2TokenServiceTest : public testing::Test { &consumer_); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { fake_cryptohome_client_ = new FakeCryptohomeClient; fake_cryptohome_client_->SetServiceIsAvailable(true); fake_cryptohome_client_->set_system_salt( @@ -95,7 +95,7 @@ class DeviceOAuth2TokenServiceTest : public testing::Test { CrosSettings::Initialize(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { CrosSettings::Shutdown(); TestingBrowserProcess::GetGlobal()->SetBrowserPolicyConnector(NULL); content::BrowserThread::GetBlockingPool()->FlushForTesting(); diff --git a/chrome/browser/chromeos/settings/device_settings_provider.h b/chrome/browser/chromeos/settings/device_settings_provider.h index b23e873..c8b952e 100644 --- a/chrome/browser/chromeos/settings/device_settings_provider.h +++ b/chrome/browser/chromeos/settings/device_settings_provider.h @@ -45,19 +45,19 @@ class DeviceSettingsProvider : public CrosSettingsProvider, static bool IsDeviceSetting(const std::string& name); // CrosSettingsProvider implementation. - virtual const base::Value* Get(const std::string& path) const OVERRIDE; + virtual const base::Value* Get(const std::string& path) const override; virtual TrustedStatus PrepareTrustedValues( - const base::Closure& callback) OVERRIDE; - virtual bool HandlesSetting(const std::string& path) const OVERRIDE; + const base::Closure& callback) override; + virtual bool HandlesSetting(const std::string& path) const override; private: // CrosSettingsProvider implementation: virtual void DoSet(const std::string& path, - const base::Value& value) OVERRIDE; + const base::Value& value) override; // DeviceSettingsService::Observer implementation: - virtual void OwnershipStatusChanged() OVERRIDE; - virtual void DeviceSettingsUpdated() OVERRIDE; + virtual void OwnershipStatusChanged() override; + virtual void DeviceSettingsUpdated() override; // Populates in-memory cache from the local_state cache that is used to store // device settings before the device is owned and to speed up policy diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc index 6f61750..115fcc3c 100644 --- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc +++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc @@ -44,7 +44,7 @@ class DeviceSettingsProviderTest : public DeviceSettingsTestBase { : local_state_(TestingBrowserProcess::GetGlobal()), user_data_dir_override_(chrome::DIR_USER_DATA) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { DeviceSettingsTestBase::SetUp(); EXPECT_CALL(*this, SettingChanged(_)).Times(AnyNumber()); @@ -56,7 +56,7 @@ class DeviceSettingsProviderTest : public DeviceSettingsTestBase { Mock::VerifyAndClearExpectations(this); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { DeviceSettingsTestBase::TearDown(); } diff --git a/chrome/browser/chromeos/settings/device_settings_service.h b/chrome/browser/chromeos/settings/device_settings_service.h index d29e689..6f2ebdf 100644 --- a/chrome/browser/chromeos/settings/device_settings_service.h +++ b/chrome/browser/chromeos/settings/device_settings_service.h @@ -175,8 +175,8 @@ class DeviceSettingsService : public SessionManagerClient::Observer { void RemoveObserver(Observer* observer); // SessionManagerClient::Observer: - virtual void OwnerKeySet(bool success) OVERRIDE; - virtual void PropertyChangeComplete(bool success) OVERRIDE; + virtual void OwnerKeySet(bool success) override; + virtual void PropertyChangeComplete(bool success) override; private: friend class OwnerSettingsServiceChromeOS; diff --git a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc index 3515a67..226c1e4 100644 --- a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc +++ b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc @@ -60,7 +60,7 @@ class DeviceSettingsServiceTest : public DeviceSettingsTestBase { is_owner_set_(false), ownership_status_(DeviceSettingsService::OWNERSHIP_UNKNOWN) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { device_policy_.payload().mutable_device_policy_refresh_rate()-> set_device_policy_refresh_rate(120); DeviceSettingsTestBase::SetUp(); diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h index 465a1efe2..cac6fc9 100644 --- a/chrome/browser/chromeos/settings/device_settings_test_helper.h +++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h @@ -82,46 +82,46 @@ class DeviceSettingsTestHelper : public SessionManagerClient { } // SessionManagerClient: - virtual void Init(dbus::Bus* bus) OVERRIDE; + 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(Observer* observer) 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 StartDeviceWipe() OVERRIDE; - virtual void RequestLockScreen() OVERRIDE; - virtual void NotifyLockScreenShown() OVERRIDE; - virtual void NotifyLockScreenDismissed() OVERRIDE; + override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual bool HasObserver(Observer* observer) 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 StartDeviceWipe() override; + virtual void RequestLockScreen() override; + virtual void NotifyLockScreenShown() override; + virtual void NotifyLockScreenDismissed() override; virtual void RetrieveActiveSessions( - const ActiveSessionsCallback& callback) OVERRIDE; + const ActiveSessionsCallback& callback) override; virtual void RetrieveDevicePolicy( - const RetrievePolicyCallback& callback) OVERRIDE; + const RetrievePolicyCallback& callback) override; virtual void RetrievePolicyForUser( const std::string& username, - const RetrievePolicyCallback& callback) OVERRIDE; + const RetrievePolicyCallback& callback) override; virtual std::string BlockingRetrievePolicyForUser( - const std::string& username) OVERRIDE; + const std::string& username) override; virtual void RetrieveDeviceLocalAccountPolicy( const std::string& account_id, - const RetrievePolicyCallback& callback) OVERRIDE; + const RetrievePolicyCallback& callback) override; virtual void StoreDevicePolicy(const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE; + const StorePolicyCallback& callback) override; virtual void StorePolicyForUser(const std::string& username, const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE; + const StorePolicyCallback& callback) override; virtual void StoreDeviceLocalAccountPolicy( const std::string& account_id, const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE; + const StorePolicyCallback& callback) override; virtual void SetFlagsForUser( const std::string& account_id, - const std::vector<std::string>& flags) OVERRIDE; + const std::vector<std::string>& flags) override; virtual void GetServerBackedStateKeys( - const StateKeysCallback& callback) OVERRIDE; + const StateKeysCallback& callback) override; private: struct PolicyState { @@ -164,8 +164,8 @@ class DeviceSettingsTestBase : public testing::Test { DeviceSettingsTestBase(); virtual ~DeviceSettingsTestBase(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; // Flushes any pending device settings operations. void FlushDeviceSettings(); diff --git a/chrome/browser/chromeos/settings/owner_flags_storage.h b/chrome/browser/chromeos/settings/owner_flags_storage.h index 1ba8b21..ec6bef3 100644 --- a/chrome/browser/chromeos/settings/owner_flags_storage.h +++ b/chrome/browser/chromeos/settings/owner_flags_storage.h @@ -22,7 +22,7 @@ class OwnerFlagsStorage : public ::about_flags::PrefServiceFlagsStorage { OwnerFlagsStorage(PrefService *prefs, CrosSettings *cros_settings); virtual ~OwnerFlagsStorage(); - virtual bool SetFlags(const std::set<std::string>& flags) OVERRIDE; + virtual bool SetFlags(const std::set<std::string>& flags) override; private: CrosSettings* cros_settings_; diff --git a/chrome/browser/chromeos/settings/session_manager_operation.h b/chrome/browser/chromeos/settings/session_manager_operation.h index 194f9fe..03aaf80 100644 --- a/chrome/browser/chromeos/settings/session_manager_operation.h +++ b/chrome/browser/chromeos/settings/session_manager_operation.h @@ -142,7 +142,7 @@ class LoadSettingsOperation : public SessionManagerOperation { protected: // SessionManagerOperation: - virtual void Run() OVERRIDE; + virtual void Run() override; private: DISALLOW_COPY_AND_ASSIGN(LoadSettingsOperation); @@ -160,7 +160,7 @@ class StoreSettingsOperation : public SessionManagerOperation { protected: // SessionManagerOperation: - virtual void Run() OVERRIDE; + virtual void Run() override; private: // Handles the result of the store operation and triggers the load. @@ -183,7 +183,7 @@ class SignAndStoreSettingsOperation : public SessionManagerOperation { virtual ~SignAndStoreSettingsOperation(); // SessionManagerOperation: - virtual void Run() OVERRIDE; + virtual void Run() override; private: void StartSigning(bool has_private_key); diff --git a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc index 0fdd35a..4b6ce6e 100644 --- a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc +++ b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc @@ -48,7 +48,7 @@ class SessionManagerOperationTest : public testing::Test { ->SetOwnerKeyUtilForTesting(owner_key_util_); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { policy_.payload().mutable_pinned_apps()->add_app_id("fake-app"); policy_.Build(); diff --git a/chrome/browser/chromeos/settings/stub_cros_settings_provider.h b/chrome/browser/chromeos/settings/stub_cros_settings_provider.h index 0a33808..ec2373f 100644 --- a/chrome/browser/chromeos/settings/stub_cros_settings_provider.h +++ b/chrome/browser/chromeos/settings/stub_cros_settings_provider.h @@ -22,15 +22,15 @@ class StubCrosSettingsProvider : public CrosSettingsProvider { virtual ~StubCrosSettingsProvider(); // CrosSettingsProvider implementation. - virtual const base::Value* Get(const std::string& path) const OVERRIDE; + virtual const base::Value* Get(const std::string& path) const override; virtual TrustedStatus PrepareTrustedValues( - const base::Closure& callback) OVERRIDE; - virtual bool HandlesSetting(const std::string& path) const OVERRIDE; + const base::Closure& callback) override; + virtual bool HandlesSetting(const std::string& path) const override; private: // CrosSettingsProvider implementation: virtual void DoSet(const std::string& path, - const base::Value& value) OVERRIDE; + const base::Value& value) override; // Initializes settings to their defaults. void SetDefaults(); diff --git a/chrome/browser/chromeos/settings/stub_cros_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/stub_cros_settings_provider_unittest.cc index 9f277a0..1f7798b 100644 --- a/chrome/browser/chromeos/settings/stub_cros_settings_provider_unittest.cc +++ b/chrome/browser/chromeos/settings/stub_cros_settings_provider_unittest.cc @@ -34,7 +34,7 @@ class StubCrosSettingsProviderTest : public testing::Test { virtual ~StubCrosSettingsProviderTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Reset the observer notification count. observer_count_.clear(); } diff --git a/chrome/browser/chromeos/settings/system_settings_provider.h b/chrome/browser/chromeos/settings/system_settings_provider.h index 8fced45..2d31951 100644 --- a/chrome/browser/chromeos/settings/system_settings_provider.h +++ b/chrome/browser/chromeos/settings/system_settings_provider.h @@ -26,18 +26,18 @@ class SystemSettingsProvider : public CrosSettingsProvider, virtual ~SystemSettingsProvider(); // CrosSettingsProvider implementation. - virtual const base::Value* Get(const std::string& path) const OVERRIDE; + virtual const base::Value* Get(const std::string& path) const override; virtual TrustedStatus PrepareTrustedValues( - const base::Closure& callback) OVERRIDE; - virtual bool HandlesSetting(const std::string& path) const OVERRIDE; + const base::Closure& callback) override; + virtual bool HandlesSetting(const std::string& path) const override; // TimezoneSettings::Observer implementation. - virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE; + virtual void TimezoneChanged(const icu::TimeZone& timezone) override; private: // CrosSettingsProvider implementation. virtual void DoSet(const std::string& path, - const base::Value& in_value) OVERRIDE; + const base::Value& in_value) override; scoped_ptr<base::StringValue> timezone_value_; diff --git a/chrome/browser/chromeos/settings/token_encryptor.h b/chrome/browser/chromeos/settings/token_encryptor.h index 61d6d47..b9654ae 100644 --- a/chrome/browser/chromeos/settings/token_encryptor.h +++ b/chrome/browser/chromeos/settings/token_encryptor.h @@ -41,9 +41,9 @@ class CryptohomeTokenEncryptor : public TokenEncryptor { virtual ~CryptohomeTokenEncryptor(); // TokenEncryptor overrides: - virtual std::string EncryptWithSystemSalt(const std::string& token) OVERRIDE; + virtual std::string EncryptWithSystemSalt(const std::string& token) override; virtual std::string DecryptWithSystemSalt( - const std::string& encrypted_token_hex) OVERRIDE; + const std::string& encrypted_token_hex) override; private: // Converts |passphrase| to a SymmetricKey using the given |salt|. diff --git a/chrome/browser/chromeos/sim_dialog_delegate.h b/chrome/browser/chromeos/sim_dialog_delegate.h index 0215050..a6a96f5 100644 --- a/chrome/browser/chromeos/sim_dialog_delegate.h +++ b/chrome/browser/chromeos/sim_dialog_delegate.h @@ -32,19 +32,19 @@ class SimDialogDelegate : public ui::WebDialogDelegate { virtual ~SimDialogDelegate(); // Overridden from ui::WebDialogDelegate: - virtual ui::ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ui::ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const override; + virtual void GetDialogSize(gfx::Size* size) const override; + virtual std::string GetDialogArgs() const override; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnCloseContents( - content::WebContents* source, bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + content::WebContents* source, bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; virtual bool HandleContextMenu( - const content::ContextMenuParams& params) OVERRIDE; + const content::ContextMenuParams& params) override; SimDialogMode dialog_mode_; diff --git a/chrome/browser/chromeos/status/data_promo_notification.h b/chrome/browser/chromeos/status/data_promo_notification.h index d78dfed..64d6141 100644 --- a/chrome/browser/chromeos/status/data_promo_notification.h +++ b/chrome/browser/chromeos/status/data_promo_notification.h @@ -31,8 +31,8 @@ class DataPromoNotification : public NetworkStateHandlerObserver { private: // NetworkStateHandlerObserver - virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE; - virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE; + virtual void NetworkPropertiesUpdated(const NetworkState* network) override; + virtual void DefaultNetworkChanged(const NetworkState* network) override; // Shows 3G promo notification if needed. void ShowOptionalMobileDataPromoNotification(); diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index 5ac934b..e021a63 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -122,27 +122,27 @@ class NetworkMenuModel : public ui::MenuModel { // ui::MenuModel implementation // GetCommandIdAt() must be implemented by subclasses. - virtual bool HasIcons() const OVERRIDE; - virtual int GetItemCount() const OVERRIDE; - virtual ui::MenuModel::ItemType GetTypeAt(int index) const OVERRIDE; - virtual ui::MenuSeparatorType GetSeparatorTypeAt(int index) const OVERRIDE; - virtual base::string16 GetLabelAt(int index) const OVERRIDE; - virtual bool IsItemDynamicAt(int index) const OVERRIDE; - virtual const gfx::FontList* GetLabelFontListAt(int index) const OVERRIDE; + virtual bool HasIcons() const override; + virtual int GetItemCount() const override; + virtual ui::MenuModel::ItemType GetTypeAt(int index) const override; + virtual ui::MenuSeparatorType GetSeparatorTypeAt(int index) const override; + virtual base::string16 GetLabelAt(int index) const override; + virtual bool IsItemDynamicAt(int index) const override; + virtual const gfx::FontList* GetLabelFontListAt(int index) const override; virtual bool GetAcceleratorAt(int index, - ui::Accelerator* accelerator) const OVERRIDE; - virtual bool IsItemCheckedAt(int index) const OVERRIDE; - virtual int GetGroupIdAt(int index) const OVERRIDE; - virtual bool GetIconAt(int index, gfx::Image* icon) OVERRIDE; + ui::Accelerator* accelerator) const override; + virtual bool IsItemCheckedAt(int index) const override; + virtual int GetGroupIdAt(int index) const override; + virtual bool GetIconAt(int index, gfx::Image* icon) override; virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt( - int index) const OVERRIDE; - virtual bool IsEnabledAt(int index) const OVERRIDE; - virtual bool IsVisibleAt(int index) const OVERRIDE; - virtual ui::MenuModel* GetSubmenuModelAt(int index) const OVERRIDE; - virtual void HighlightChangedTo(int index) OVERRIDE; - virtual void ActivatedAt(int index) OVERRIDE; - virtual void SetMenuModelDelegate(ui::MenuModelDelegate* delegate) OVERRIDE; - virtual ui::MenuModelDelegate* GetMenuModelDelegate() const OVERRIDE; + int index) const override; + virtual bool IsEnabledAt(int index) const override; + virtual bool IsVisibleAt(int index) const override; + virtual ui::MenuModel* GetSubmenuModelAt(int index) const override; + virtual void HighlightChangedTo(int index) override; + virtual void ActivatedAt(int index) override; + virtual void SetMenuModelDelegate(ui::MenuModelDelegate* delegate) override; + virtual ui::MenuModelDelegate* GetMenuModelDelegate() const override; protected: enum MenuItemFlags { @@ -180,10 +180,10 @@ class MoreMenuModel : public NetworkMenuModel { virtual ~MoreMenuModel() {} // NetworkMenuModel implementation. - virtual void InitMenuItems(bool should_open_button_options) OVERRIDE; + virtual void InitMenuItems(bool should_open_button_options) override; // ui::MenuModel implementation - virtual int GetCommandIdAt(int index) const OVERRIDE; + virtual int GetCommandIdAt(int index) const override; private: DISALLOW_COPY_AND_ASSIGN(MoreMenuModel); @@ -198,10 +198,10 @@ class MainMenuModel : public NetworkMenuModel { virtual ~MainMenuModel() {} // NetworkMenuModel implementation. - virtual void InitMenuItems(bool should_open_button_options) OVERRIDE; + virtual void InitMenuItems(bool should_open_button_options) override; // ui::MenuModel implementation - virtual int GetCommandIdAt(int index) const OVERRIDE; + virtual int GetCommandIdAt(int index) const override; private: void AddWirelessNetworkMenuItem(const NetworkState* wifi_network, int flag); diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.h b/chrome/browser/chromeos/system/automatic_reboot_manager.h index fba9cc7..638c9ac 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager.h +++ b/chrome/browser/chromeos/system/automatic_reboot_manager.h @@ -97,19 +97,19 @@ class AutomaticRebootManager : public PowerManagerClient::Observer, void RemoveObserver(AutomaticRebootManagerObserver* observer); // PowerManagerClient::Observer: - virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE; + virtual void SuspendDone(const base::TimeDelta& sleep_duration) override; // UpdateEngineClient::Observer: virtual void UpdateStatusChanged( - const UpdateEngineClient::Status& status) OVERRIDE; + const UpdateEngineClient::Status& status) override; // wm::UserActivityObserver: - virtual void OnUserActivity(const ui::Event* event) OVERRIDE; + virtual void OnUserActivity(const ui::Event* event) override; // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; static void RegisterPrefs(PrefRegistrySimple* registry); diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc index 82744c5..6a23376 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc +++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc @@ -60,14 +60,14 @@ class MockTimeSingleThreadTaskRunner : public base::SingleThreadTaskRunner { MockTimeSingleThreadTaskRunner(); // base::SingleThreadTaskRunner: - virtual bool RunsTasksOnCurrentThread() const OVERRIDE; + virtual bool RunsTasksOnCurrentThread() const override; virtual bool PostDelayedTask(const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE; + base::TimeDelta delay) override; virtual bool PostNonNestableDelayedTask( const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE; + base::TimeDelta delay) override; void SetUptimeFile(const base::FilePath& uptime_file); void SetUptime(const base::TimeDelta& uptime); @@ -107,7 +107,7 @@ class MockTimeTickClock : public base::TickClock { virtual ~MockTimeTickClock(); // base::TickClock: - virtual base::TimeTicks NowTicks() OVERRIDE; + virtual base::TimeTicks NowTicks() override; private: scoped_refptr<MockTimeSingleThreadTaskRunner> task_runner_; @@ -125,8 +125,8 @@ class AutomaticRebootManagerBasicTest : public testing::Test { virtual ~AutomaticRebootManagerBasicTest(); // testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; void SetUpdateRebootNeededUptime(const base::TimeDelta& uptime); void SetRebootAfterUpdate(bool reboot_after_update, bool expect_reboot); diff --git a/chrome/browser/chromeos/system/device_change_handler.h b/chrome/browser/chromeos/system/device_change_handler.h index 4544af3..345c35f 100644 --- a/chrome/browser/chromeos/system/device_change_handler.h +++ b/chrome/browser/chromeos/system/device_change_handler.h @@ -20,8 +20,8 @@ class DeviceChangeHandler : public PointerDeviceObserver::Observer { private: // PointerDeviceObserver::Observer implementation. - virtual void TouchpadExists(bool exists) OVERRIDE; - virtual void MouseExists(bool exists) OVERRIDE; + virtual void TouchpadExists(bool exists) override; + virtual void MouseExists(bool exists) override; scoped_ptr<PointerDeviceObserver> pointer_device_observer_; }; diff --git a/chrome/browser/chromeos/system/fake_input_device_settings.h b/chrome/browser/chromeos/system/fake_input_device_settings.h index b1aa6b8..26978f9 100644 --- a/chrome/browser/chromeos/system/fake_input_device_settings.h +++ b/chrome/browser/chromeos/system/fake_input_device_settings.h @@ -19,22 +19,22 @@ class FakeInputDeviceSettings : public InputDeviceSettings { virtual ~FakeInputDeviceSettings(); // Overridden from InputDeviceSettings. - virtual void TouchpadExists(const DeviceExistsCallback& callback) OVERRIDE; + virtual void TouchpadExists(const DeviceExistsCallback& callback) override; virtual void UpdateTouchpadSettings(const TouchpadSettings& settings) - OVERRIDE; - virtual void SetTouchpadSensitivity(int value) OVERRIDE; - virtual void SetTapToClick(bool enabled) OVERRIDE; - virtual void SetThreeFingerClick(bool enabled) OVERRIDE; - virtual void SetTapDragging(bool enabled) OVERRIDE; - virtual void MouseExists(const DeviceExistsCallback& callback) OVERRIDE; - virtual void UpdateMouseSettings(const MouseSettings& settings) OVERRIDE; - virtual void SetMouseSensitivity(int value) OVERRIDE; - virtual void SetPrimaryButtonRight(bool right) OVERRIDE; - virtual void SetNaturalScroll(bool enabled) OVERRIDE; - - virtual bool ForceKeyboardDrivenUINavigation() OVERRIDE; - virtual void ReapplyTouchpadSettings() OVERRIDE; - virtual void ReapplyMouseSettings() OVERRIDE; + override; + virtual void SetTouchpadSensitivity(int value) override; + virtual void SetTapToClick(bool enabled) override; + virtual void SetThreeFingerClick(bool enabled) override; + virtual void SetTapDragging(bool enabled) override; + virtual void MouseExists(const DeviceExistsCallback& callback) override; + virtual void UpdateMouseSettings(const MouseSettings& settings) override; + virtual void SetMouseSensitivity(int value) override; + virtual void SetPrimaryButtonRight(bool right) override; + virtual void SetNaturalScroll(bool enabled) override; + + virtual bool ForceKeyboardDrivenUINavigation() override; + virtual void ReapplyTouchpadSettings() override; + virtual void ReapplyMouseSettings() override; const TouchpadSettings& current_touchpad_settings() const { return current_touchpad_settings_; diff --git a/chrome/browser/chromeos/system/input_device_settings.cc b/chrome/browser/chromeos/system/input_device_settings.cc index 66ae8f9..2e6fbf4 100644 --- a/chrome/browser/chromeos/system/input_device_settings.cc +++ b/chrome/browser/chromeos/system/input_device_settings.cc @@ -142,21 +142,21 @@ class InputDeviceSettingsImpl : public InputDeviceSettings { private: // Overridden from InputDeviceSettings. - virtual void TouchpadExists(const DeviceExistsCallback& callback) OVERRIDE; + virtual void TouchpadExists(const DeviceExistsCallback& callback) override; virtual void UpdateTouchpadSettings(const TouchpadSettings& settings) - OVERRIDE; - virtual void SetTouchpadSensitivity(int value) OVERRIDE; - virtual void SetTapToClick(bool enabled) OVERRIDE; - virtual void SetThreeFingerClick(bool enabled) OVERRIDE; - virtual void SetTapDragging(bool enabled) OVERRIDE; - virtual void SetNaturalScroll(bool enabled) OVERRIDE; - virtual void MouseExists(const DeviceExistsCallback& callback) OVERRIDE; - virtual void UpdateMouseSettings(const MouseSettings& update) OVERRIDE; - virtual void SetMouseSensitivity(int value) OVERRIDE; - virtual void SetPrimaryButtonRight(bool right) OVERRIDE; - virtual bool ForceKeyboardDrivenUINavigation() OVERRIDE; - virtual void ReapplyTouchpadSettings() OVERRIDE; - virtual void ReapplyMouseSettings() OVERRIDE; + override; + virtual void SetTouchpadSensitivity(int value) override; + virtual void SetTapToClick(bool enabled) override; + virtual void SetThreeFingerClick(bool enabled) override; + virtual void SetTapDragging(bool enabled) override; + virtual void SetNaturalScroll(bool enabled) override; + virtual void MouseExists(const DeviceExistsCallback& callback) override; + virtual void UpdateMouseSettings(const MouseSettings& update) override; + virtual void SetMouseSensitivity(int value) override; + virtual void SetPrimaryButtonRight(bool right) override; + virtual bool ForceKeyboardDrivenUINavigation() override; + virtual void ReapplyTouchpadSettings() override; + virtual void ReapplyMouseSettings() override; private: TouchpadSettings current_touchpad_settings_; diff --git a/chrome/browser/chromeos/system/pointer_device_observer.h b/chrome/browser/chromeos/system/pointer_device_observer.h index 5ea62b9..2e91903 100644 --- a/chrome/browser/chromeos/system/pointer_device_observer.h +++ b/chrome/browser/chromeos/system/pointer_device_observer.h @@ -37,9 +37,9 @@ class PointerDeviceObserver : public DeviceHierarchyObserver { private: // DeviceHierarchyObserver implementation. - virtual void DeviceHierarchyChanged() OVERRIDE; - virtual void DeviceAdded(int device_id) OVERRIDE {} - virtual void DeviceRemoved(int device_id) OVERRIDE {} + virtual void DeviceHierarchyChanged() override; + virtual void DeviceAdded(int device_id) override {} + virtual void DeviceRemoved(int device_id) override {} // Check for pointer devices. void CheckTouchpadExists(); diff --git a/chrome/browser/chromeos/system/syslogs_provider.cc b/chrome/browser/chromeos/system/syslogs_provider.cc index 3bd8957..3cfaab6 100644 --- a/chrome/browser/chromeos/system/syslogs_provider.cc +++ b/chrome/browser/chromeos/system/syslogs_provider.cc @@ -186,7 +186,7 @@ class SyslogsProviderImpl : public SyslogsProvider { bool compress_logs, SyslogsContext context, const ReadCompleteCallback& callback, - base::CancelableTaskTracker* tracker) OVERRIDE; + base::CancelableTaskTracker* tracker) override; static SyslogsProviderImpl* GetInstance(); @@ -264,7 +264,7 @@ class SyslogsMemoryHandler : public MemoryDetails { LogDictionaryType* logs, std::string* zip_content); - virtual void OnDetailsAvailable() OVERRIDE; + virtual void OnDetailsAvailable() override; private: virtual ~SyslogsMemoryHandler(); diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc index b097f4f..c0185c5 100644 --- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc +++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc @@ -68,31 +68,31 @@ class TrayAccessibilityTest // The profile which should be used by these tests. Profile* GetProfile() { return ProfileManager::GetActiveUserProfile(); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { EXPECT_CALL(provider_, IsInitializationComplete(_)) .WillRepeatedly(Return(true)); policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_); AccessibilityManager::SetBrailleControllerForTest(&braille_controller_); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kLoginManager); command_line->AppendSwitchASCII(switches::kLoginProfile, TestingProfile::kTestUserProfileDir); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { AccessibilityManager::Get()->SetProfileForTest(GetProfile()); MagnificationManager::Get()->SetProfileForTest(GetProfile()); } - virtual void RunTestOnMainThreadLoop() OVERRIDE { + virtual void RunTestOnMainThreadLoop() override { // Need to mark oobe completed to show detailed views. StartupUtils::MarkOobeCompleted(); InProcessBrowserTest::RunTestOnMainThreadLoop(); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { AccessibilityManager::SetBrailleControllerForTest(NULL); } diff --git a/chrome/browser/chromeos/system_logs/command_line_log_source.h b/chrome/browser/chromeos/system_logs/command_line_log_source.h index a4ad5c7..5464e02 100644 --- a/chrome/browser/chromeos/system_logs/command_line_log_source.h +++ b/chrome/browser/chromeos/system_logs/command_line_log_source.h @@ -17,7 +17,7 @@ class CommandLineLogSource : public SystemLogsSource { virtual ~CommandLineLogSource() {} // SystemLogsSource override. - virtual void Fetch(const SysLogsSourceCallback& callback) OVERRIDE; + virtual void Fetch(const SysLogsSourceCallback& callback) override; private: DISALLOW_COPY_AND_ASSIGN(CommandLineLogSource); diff --git a/chrome/browser/chromeos/system_logs/dbus_log_source.h b/chrome/browser/chromeos/system_logs/dbus_log_source.h index b244046..b45d83b 100644 --- a/chrome/browser/chromeos/system_logs/dbus_log_source.h +++ b/chrome/browser/chromeos/system_logs/dbus_log_source.h @@ -16,7 +16,7 @@ class DBusLogSource : public SystemLogsSource { virtual ~DBusLogSource() {} // SystemLogsSource override. - virtual void Fetch(const SysLogsSourceCallback& request) OVERRIDE; + virtual void Fetch(const SysLogsSourceCallback& request) override; private: DISALLOW_COPY_AND_ASSIGN(DBusLogSource); diff --git a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.h b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.h index 8beb30d..3553103 100644 --- a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.h +++ b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.h @@ -27,7 +27,7 @@ class DebugDaemonLogSource : public SystemLogsSource { // Fetches logs from the daemon over dbus. After the fetch is complete, the // results will be forwarded to the request supplied to the constructor and // this instance will free itself. - virtual void Fetch(const SysLogsSourceCallback& callback) OVERRIDE; + virtual void Fetch(const SysLogsSourceCallback& callback) override; private: typedef std::map<std::string, std::string> KeyValueMap; diff --git a/chrome/browser/chromeos/system_logs/lsb_release_log_source.h b/chrome/browser/chromeos/system_logs/lsb_release_log_source.h index c68db1d..f25745fc 100644 --- a/chrome/browser/chromeos/system_logs/lsb_release_log_source.h +++ b/chrome/browser/chromeos/system_logs/lsb_release_log_source.h @@ -15,7 +15,7 @@ class LsbReleaseLogSource : public SystemLogsSource { virtual ~LsbReleaseLogSource() {} // SystemLogsSource override. - virtual void Fetch(const SysLogsSourceCallback& callback) OVERRIDE; + virtual void Fetch(const SysLogsSourceCallback& callback) override; private: DISALLOW_COPY_AND_ASSIGN(LsbReleaseLogSource); diff --git a/chrome/browser/chromeos/system_logs/network_event_log_source.h b/chrome/browser/chromeos/system_logs/network_event_log_source.h index 35309f6..a8e2fc29 100644 --- a/chrome/browser/chromeos/system_logs/network_event_log_source.h +++ b/chrome/browser/chromeos/system_logs/network_event_log_source.h @@ -16,7 +16,7 @@ class NetworkEventLogSource : public SystemLogsSource { virtual ~NetworkEventLogSource() {} // SystemLogsSource override. - virtual void Fetch(const SysLogsSourceCallback& request) OVERRIDE; + virtual void Fetch(const SysLogsSourceCallback& request) override; private: DISALLOW_COPY_AND_ASSIGN(NetworkEventLogSource); diff --git a/chrome/browser/chromeos/system_logs/touch_log_source.h b/chrome/browser/chromeos/system_logs/touch_log_source.h index 7102f93..664635e 100644 --- a/chrome/browser/chromeos/system_logs/touch_log_source.h +++ b/chrome/browser/chromeos/system_logs/touch_log_source.h @@ -16,7 +16,7 @@ class TouchLogSource : public SystemLogsSource { private: // Overridden from SystemLogsSource: - virtual void Fetch(const SysLogsSourceCallback& callback) OVERRIDE; + virtual void Fetch(const SysLogsSourceCallback& callback) override; DISALLOW_COPY_AND_ASSIGN(TouchLogSource); }; diff --git a/chrome/browser/chromeos/timezone/timezone_request.h b/chrome/browser/chromeos/timezone/timezone_request.h index 08174b7..817b555 100644 --- a/chrome/browser/chromeos/timezone/timezone_request.h +++ b/chrome/browser/chromeos/timezone/timezone_request.h @@ -95,7 +95,7 @@ class TimeZoneRequest : private net::URLFetcherDelegate { private: // net::URLFetcherDelegate - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; // Start new request. void StartRequest(); diff --git a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h index 700b44d..bb714fa 100644 --- a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h +++ b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h @@ -48,10 +48,10 @@ class AccessibilityFocusRingController private: // FocusRingLayerDelegate. - virtual void OnDeviceScaleFactorChanged() OVERRIDE; + virtual void OnDeviceScaleFactorChanged() override; // CompositorAnimationObserver. - virtual void OnAnimationStep(base::TimeTicks timestamp) OVERRIDE; + virtual void OnAnimationStep(base::TimeTicks timestamp) override; void Update(); diff --git a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc index b1ecc4a..8054780 100644 --- a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc +++ b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc @@ -22,7 +22,7 @@ class TestableAccessibilityFocusRingController AccessibilityFocusRingController::RectsToRings(rects, rings); } - virtual int GetMargin() const OVERRIDE { + virtual int GetMargin() const override { return margin_; } diff --git a/chrome/browser/chromeos/ui/accessibility_focus_ring_layer.h b/chrome/browser/chromeos/ui/accessibility_focus_ring_layer.h index 71f064c..273f021 100644 --- a/chrome/browser/chromeos/ui/accessibility_focus_ring_layer.h +++ b/chrome/browser/chromeos/ui/accessibility_focus_ring_layer.h @@ -23,7 +23,7 @@ class AccessibilityFocusRingLayer : public FocusRingLayer { private: // ui::LayerDelegate overrides: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaintLayer(gfx::Canvas* canvas) override; // The outline of the current focus ring. AccessibilityFocusRing ring_; diff --git a/chrome/browser/chromeos/ui/choose_mobile_network_dialog.h b/chrome/browser/chromeos/ui/choose_mobile_network_dialog.h index 99b4e4e..0cf08ef 100644 --- a/chrome/browser/chromeos/ui/choose_mobile_network_dialog.h +++ b/chrome/browser/chromeos/ui/choose_mobile_network_dialog.h @@ -22,19 +22,19 @@ class ChooseMobileNetworkDialog : public ui::WebDialogDelegate { ChooseMobileNetworkDialog(); // Overridden from ui::WebDialogDelegate: - virtual ui::ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ui::ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const override; + virtual void GetDialogSize(gfx::Size* size) const override; + virtual std::string GetDialogArgs() const override; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnCloseContents( - content::WebContents* source, bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + content::WebContents* source, bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; virtual bool HandleContextMenu( - const content::ContextMenuParams& params) OVERRIDE; + const content::ContextMenuParams& params) override; DISALLOW_COPY_AND_ASSIGN(ChooseMobileNetworkDialog); }; diff --git a/chrome/browser/chromeos/ui/echo_dialog_view.h b/chrome/browser/chromeos/ui/echo_dialog_view.h index e214e46..a9ab789 100644 --- a/chrome/browser/chromeos/ui/echo_dialog_view.h +++ b/chrome/browser/chromeos/ui/echo_dialog_view.h @@ -50,23 +50,24 @@ class EchoDialogView : public views::DialogDelegateView, friend class ExtensionEchoPrivateApiTest; // views::DialogDelegate overrides. - virtual int GetDialogButtons() const OVERRIDE; - virtual int GetDefaultDialogButton() const OVERRIDE; - virtual base::string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; - virtual bool Cancel() OVERRIDE; - virtual bool Accept() OVERRIDE; + virtual int GetDialogButtons() const override; + virtual int GetDefaultDialogButton() const override; + virtual base::string16 GetDialogButtonLabel( + ui::DialogButton button) const override; + virtual bool Cancel() override; + virtual bool Accept() override; // views::WidgetDelegate overrides. - virtual ui::ModalType GetModalType() const OVERRIDE; - virtual bool ShouldShowWindowTitle() const OVERRIDE; - virtual bool ShouldShowWindowIcon() const OVERRIDE; + virtual ui::ModalType GetModalType() const override; + virtual bool ShouldShowWindowTitle() const override; + virtual bool ShouldShowWindowIcon() const override; // views::LinkListener override. virtual void StyledLabelLinkClicked(const gfx::Range& range, - int event_flags) OVERRIDE; + int event_flags) override; // views::View override. - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; // Sets the border and bounds for the styled label containing the dialog // text. diff --git a/chrome/browser/chromeos/ui/focus_ring_controller.h b/chrome/browser/chromeos/ui/focus_ring_controller.h index 50644cb..caffb6e 100644 --- a/chrome/browser/chromeos/ui/focus_ring_controller.h +++ b/chrome/browser/chromeos/ui/focus_ring_controller.h @@ -35,7 +35,7 @@ class FocusRingController : public FocusRingLayerDelegate, private: // FocusRingLayerDelegate. - virtual void OnDeviceScaleFactorChanged() OVERRIDE; + virtual void OnDeviceScaleFactorChanged() override; // Sets the focused |widget|. void SetWidget(views::Widget* widget); @@ -45,19 +45,19 @@ class FocusRingController : public FocusRingLayerDelegate, void UpdateFocusRing(); // views::WidgetObserver overrides: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; virtual void OnWidgetBoundsChanged(views::Widget* widget, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; // views::WidgetFocusChangeListener overrides: virtual void OnNativeFocusChange(gfx::NativeView focused_before, - gfx::NativeView focused_now) OVERRIDE; + gfx::NativeView focused_now) override; // views::FocusChangeListener overrides: virtual void OnWillChangeFocus(views::View* focused_before, - views::View* focused_now) OVERRIDE; + views::View* focused_now) override; virtual void OnDidChangeFocus(views::View* focused_before, - views::View* focused_now) OVERRIDE; + views::View* focused_now) override; bool visible_; diff --git a/chrome/browser/chromeos/ui/focus_ring_layer.h b/chrome/browser/chromeos/ui/focus_ring_layer.h index 1d8e1fa..46b888c 100644 --- a/chrome/browser/chromeos/ui/focus_ring_layer.h +++ b/chrome/browser/chromeos/ui/focus_ring_layer.h @@ -50,11 +50,11 @@ class FocusRingLayer : public ui::LayerDelegate { private: // ui::LayerDelegate overrides: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaintLayer(gfx::Canvas* canvas) override; virtual void OnDelegatedFrameDamage( - const gfx::Rect& damage_rect_in_dip) OVERRIDE; - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE; + const gfx::Rect& damage_rect_in_dip) override; + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; + virtual base::Closure PrepareForLayerBoundsChange() override; // The object that owns this layer. FocusRingLayerDelegate* delegate_; diff --git a/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc b/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc index 352300c..bfcc7bc 100644 --- a/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc +++ b/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc @@ -168,7 +168,7 @@ class IdleAppNameNotificationDelegateView layer->SetBounds(rect); } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { SkPaint paint; paint.setStyle(SkPaint::kFill_Style); paint.setColor(kWindowBackgroundColor); @@ -176,13 +176,13 @@ class IdleAppNameNotificationDelegateView views::WidgetDelegateView::OnPaint(canvas); } - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE { + virtual void GetAccessibleState(ui::AXViewState* state) override { state->name = spoken_text_; state->role = ui::AX_ROLE_ALERT; } // ImplicitAnimationObserver overrides - virtual void OnImplicitAnimationsCompleted() OVERRIDE { + virtual void OnImplicitAnimationsCompleted() override { Close(); } diff --git a/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc b/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc index d930af1..2f2481e 100644 --- a/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc +++ b/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc @@ -30,7 +30,7 @@ class IdleAppNameNotificationViewTest : public BrowserWithTestWindowTest { virtual ~IdleAppNameNotificationViewTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Add the application switch. CommandLine::ForCurrentProcess()->AppendSwitchASCII(::switches::kAppId, kTestAppName); @@ -65,7 +65,7 @@ class IdleAppNameNotificationViewTest : public BrowserWithTestWindowTest { &error); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // The destruction of the widget might be a delayed task. base::MessageLoop::current()->RunUntilIdle(); BrowserWithTestWindowTest::TearDown(); diff --git a/chrome/browser/chromeos/ui/idle_logout_dialog_view.h b/chrome/browser/chromeos/ui/idle_logout_dialog_view.h index afca216..79417e8 100644 --- a/chrome/browser/chromeos/ui/idle_logout_dialog_view.h +++ b/chrome/browser/chromeos/ui/idle_logout_dialog_view.h @@ -44,10 +44,10 @@ class IdleLogoutDialogView : public views::DialogDelegateView { static void CloseDialog(); // views::DialogDelegateView: - virtual int GetDialogButtons() const OVERRIDE; - virtual ui::ModalType GetModalType() const OVERRIDE; - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual bool Close() OVERRIDE; + virtual int GetDialogButtons() const override; + virtual ui::ModalType GetModalType() const override; + virtual base::string16 GetWindowTitle() const override; + virtual bool Close() override; private: friend class MockIdleLogoutSettingsProvider; diff --git a/chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc b/chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc index ff5fac3..fc0e16e 100644 --- a/chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc +++ b/chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc @@ -18,15 +18,15 @@ public: explicit MockIdleLogoutSettingsProvider(KioskModeSettings* mock_settings) : mock_settings_(mock_settings) {} - virtual base::TimeDelta GetCountdownUpdateInterval() OVERRIDE { + virtual base::TimeDelta GetCountdownUpdateInterval() override { return base::TimeDelta::FromMilliseconds(0); } - virtual KioskModeSettings* GetKioskModeSettings() OVERRIDE { + virtual KioskModeSettings* GetKioskModeSettings() override { return mock_settings_; } - virtual void LogoutCurrentUser(IdleLogoutDialogView* dialog) OVERRIDE { + virtual void LogoutCurrentUser(IdleLogoutDialogView* dialog) override { dialog->GetWidget()->Close(); } @@ -42,7 +42,7 @@ class IdleLogoutDialogViewTest : public InProcessBrowserTest { virtual ~IdleLogoutDialogViewTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { mock_settings_.reset(new MockKioskModeSettings()); mock_provider_.reset( new MockIdleLogoutSettingsProvider(mock_settings_.get())); diff --git a/chrome/browser/chromeos/ui/inline_login_dialog.h b/chrome/browser/chromeos/ui/inline_login_dialog.h index 118d92e..6ef37ad 100644 --- a/chrome/browser/chromeos/ui/inline_login_dialog.h +++ b/chrome/browser/chromeos/ui/inline_login_dialog.h @@ -24,18 +24,18 @@ class InlineLoginDialog : public WebDialogDelegate { virtual ~InlineLoginDialog(); // Overriden from WebDialogDelegate. - virtual ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; - virtual bool CanResizeDialog() const OVERRIDE; - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const override; + virtual void GetDialogSize(gfx::Size* size) const override; + virtual std::string GetDialogArgs() const override; + virtual bool CanResizeDialog() const override; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnCloseContents(content::WebContents* source, - bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; DISALLOW_COPY_AND_ASSIGN(InlineLoginDialog); }; diff --git a/chrome/browser/chromeos/ui/kiosk_external_update_notification.cc b/chrome/browser/chromeos/ui/kiosk_external_update_notification.cc index 32c96d4..71d4fdf 100644 --- a/chrome/browser/chromeos/ui/kiosk_external_update_notification.cc +++ b/chrome/browser/chromeos/ui/kiosk_external_update_notification.cc @@ -55,7 +55,7 @@ class KioskExternalUpdateNotificationView : public views::WidgetDelegateView { void SetMessage(const base::string16& message) { label_->SetText(message); } // views::WidgetDelegateView overrides: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { SkPaint paint; paint.setStyle(SkPaint::kFill_Style); paint.setColor(kWindowBackgroundColor); @@ -63,7 +63,7 @@ class KioskExternalUpdateNotificationView : public views::WidgetDelegateView { views::WidgetDelegateView::OnPaint(canvas); } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(kPreferredWidth, kPreferredHeight); } diff --git a/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.h b/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.h index 4b0a1706..a1f5554 100644 --- a/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.h +++ b/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.h @@ -19,7 +19,7 @@ class ScreenCaptureNotificationUIChromeOS : public ScreenCaptureNotificationUI { // ScreenCaptureNotificationUI overrides. virtual gfx::NativeViewId OnStarted(const base::Closure& stop_callback) - OVERRIDE; + override; private: const base::string16 text_; diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.h b/chrome/browser/chromeos/upgrade_detector_chromeos.h index 93be807..cbd2997 100644 --- a/chrome/browser/chromeos/upgrade_detector_chromeos.h +++ b/chrome/browser/chromeos/upgrade_detector_chromeos.h @@ -34,7 +34,7 @@ class UpgradeDetectorChromeos : public UpgradeDetector, // chromeos::UpdateEngineClient::Observer implementation. virtual void UpdateStatusChanged( - const chromeos::UpdateEngineClient::Status& status) OVERRIDE; + const chromeos::UpdateEngineClient::Status& status) override; // The function that sends out a notification (after a certain time has // elapsed) that lets the rest of the UI know we should start notifying the |