diff options
| author | dcheng <dcheng@chromium.org> | 2015-01-21 06:19:21 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-21 14:20:52 +0000 |
| commit | 465662ed7e306369e589acf088ff311522a79385 (patch) | |
| tree | 0da1490d316df1ca843e41bf3c46b46ffce43b2f | |
| parent | 49c6e74138dc5f81bc35ddf4fe7acb1b6c2c9f55 (diff) | |
| download | chromium_src-465662ed7e306369e589acf088ff311522a79385.zip chromium_src-465662ed7e306369e589acf088ff311522a79385.tar.gz chromium_src-465662ed7e306369e589acf088ff311522a79385.tar.bz2 | |
Update {virtual,override,final} to follow C++11 style chrome/browser/ui.
The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.
This patch was automatically generated with a ChromeOS build using a
variation of https://codereview.chromium.org/598073004.
BUG=417463
R=msw@chromium.org
Review URL: https://codereview.chromium.org/857433003
Cr-Commit-Position: refs/heads/master@{#312354}
34 files changed, 223 insertions, 252 deletions
diff --git a/chrome/browser/ui/app_list/test/fake_profile.h b/chrome/browser/ui/app_list/test/fake_profile.h index 9bbffb5..16ede3b 100644 --- a/chrome/browser/ui/app_list/test/fake_profile.h +++ b/chrome/browser/ui/app_list/test/fake_profile.h @@ -82,10 +82,10 @@ class FakeProfile : public Profile { void set_last_selected_directory(const base::FilePath& path) override; #if defined(OS_CHROMEOS) - virtual void ChangeAppLocale( - const std::string& locale, AppLocaleChangedVia via) override; - virtual void OnLogin() override; - virtual void InitChromeOSPreferences() override; + void ChangeAppLocale(const std::string& locale, + AppLocaleChangedVia via) override; + void OnLogin() override; + void InitChromeOSPreferences() override; #endif // defined(OS_CHROMEOS) PrefProxyConfigTracker* GetProxyConfigTracker() override; diff --git a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc index 5d33194..380d058 100644 --- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc +++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc @@ -33,12 +33,9 @@ class MaximizableWidgetDelegate : public views::WidgetDelegateView { public: MaximizableWidgetDelegate() { } - virtual ~MaximizableWidgetDelegate() { - } + ~MaximizableWidgetDelegate() override {} - virtual bool CanMaximize() const override { - return true; - } + bool CanMaximize() const override { return true; } private: DISALLOW_COPY_AND_ASSIGN(MaximizableWidgetDelegate); diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h index e53a7da..5ae83fb 100644 --- a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h +++ b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h @@ -10,13 +10,13 @@ class ChromeNewWindowDelegateChromeos : public ChromeNewWindowDelegate { public: ChromeNewWindowDelegateChromeos(); - virtual ~ChromeNewWindowDelegateChromeos(); + ~ChromeNewWindowDelegateChromeos() override; // Overridden from ash::NewWindowDelegate: - virtual void OpenFileManager() override; - virtual void OpenCrosh() override; - virtual void OpenGetHelp() override; - virtual void ShowKeyboardOverlay() override; + void OpenFileManager() override; + void OpenCrosh() override; + void OpenGetHelp() override; + void ShowKeyboardOverlay() override; private: DISALLOW_COPY_AND_ASSIGN(ChromeNewWindowDelegateChromeos); diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc index 3bff447..9a3962a 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc @@ -64,102 +64,102 @@ void InitAfterSessionStart() { class AccessibilityDelegateImpl : public ash::AccessibilityDelegate { public: AccessibilityDelegateImpl() {} - virtual ~AccessibilityDelegateImpl() {} + ~AccessibilityDelegateImpl() override {} - virtual void ToggleHighContrast() override { + void ToggleHighContrast() override { DCHECK(chromeos::AccessibilityManager::Get()); chromeos::AccessibilityManager::Get()->EnableHighContrast( !chromeos::AccessibilityManager::Get()->IsHighContrastEnabled()); } - virtual bool IsSpokenFeedbackEnabled() const override { + bool IsSpokenFeedbackEnabled() const override { DCHECK(chromeos::AccessibilityManager::Get()); return chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled(); } - virtual void ToggleSpokenFeedback( + void ToggleSpokenFeedback( ui::AccessibilityNotificationVisibility notify) override { DCHECK(chromeos::AccessibilityManager::Get()); chromeos::AccessibilityManager::Get()->ToggleSpokenFeedback(notify); } - virtual bool IsHighContrastEnabled() const override { + bool IsHighContrastEnabled() const override { DCHECK(chromeos::AccessibilityManager::Get()); return chromeos::AccessibilityManager::Get()->IsHighContrastEnabled(); } - virtual void SetMagnifierEnabled(bool enabled) override { + void SetMagnifierEnabled(bool enabled) override { DCHECK(chromeos::MagnificationManager::Get()); return chromeos::MagnificationManager::Get()->SetMagnifierEnabled(enabled); } - virtual void SetMagnifierType(ui::MagnifierType type) override { + void SetMagnifierType(ui::MagnifierType type) override { DCHECK(chromeos::MagnificationManager::Get()); return chromeos::MagnificationManager::Get()->SetMagnifierType(type); } - virtual bool IsMagnifierEnabled() const override { + bool IsMagnifierEnabled() const override { DCHECK(chromeos::MagnificationManager::Get()); return chromeos::MagnificationManager::Get()->IsMagnifierEnabled(); } - virtual ui::MagnifierType GetMagnifierType() const override { + ui::MagnifierType GetMagnifierType() const override { DCHECK(chromeos::MagnificationManager::Get()); return chromeos::MagnificationManager::Get()->GetMagnifierType(); } - virtual void SetLargeCursorEnabled(bool enabled) override { + void SetLargeCursorEnabled(bool enabled) override { DCHECK(chromeos::AccessibilityManager::Get()); return chromeos::AccessibilityManager::Get()->EnableLargeCursor(enabled); } - virtual bool IsLargeCursorEnabled() const override { + bool IsLargeCursorEnabled() const override { DCHECK(chromeos::AccessibilityManager::Get()); return chromeos::AccessibilityManager::Get()->IsLargeCursorEnabled(); } - virtual void SetAutoclickEnabled(bool enabled) override { + void SetAutoclickEnabled(bool enabled) override { DCHECK(chromeos::AccessibilityManager::Get()); return chromeos::AccessibilityManager::Get()->EnableAutoclick(enabled); } - virtual bool IsAutoclickEnabled() const override { + bool IsAutoclickEnabled() const override { DCHECK(chromeos::AccessibilityManager::Get()); return chromeos::AccessibilityManager::Get()->IsAutoclickEnabled(); } - virtual void SetVirtualKeyboardEnabled(bool enabled) override { + void SetVirtualKeyboardEnabled(bool enabled) override { DCHECK(chromeos::AccessibilityManager::Get()); return chromeos::AccessibilityManager::Get()-> EnableVirtualKeyboard(enabled); } - virtual bool IsVirtualKeyboardEnabled() const override { + bool IsVirtualKeyboardEnabled() const override { DCHECK(chromeos::AccessibilityManager::Get()); return chromeos::AccessibilityManager::Get()->IsVirtualKeyboardEnabled(); } - virtual bool ShouldShowAccessibilityMenu() const override { + bool ShouldShowAccessibilityMenu() const override { DCHECK(chromeos::AccessibilityManager::Get()); return chromeos::AccessibilityManager::Get()-> ShouldShowAccessibilityMenu(); } - virtual bool IsBrailleDisplayConnected() const override { + bool IsBrailleDisplayConnected() const override { DCHECK(chromeos::AccessibilityManager::Get()); return chromeos::AccessibilityManager::Get()->IsBrailleDisplayConnected(); } - virtual void SilenceSpokenFeedback() const override { + void SilenceSpokenFeedback() const override { TtsController::GetInstance()->Stop(); } - virtual void SaveScreenMagnifierScale(double scale) override { + void SaveScreenMagnifierScale(double scale) override { if (chromeos::MagnificationManager::Get()) chromeos::MagnificationManager::Get()->SaveScreenMagnifierScale(scale); } - virtual double GetSavedScreenMagnifierScale() override { + double GetSavedScreenMagnifierScale() override { if (chromeos::MagnificationManager::Get()) { return chromeos::MagnificationManager::Get()-> GetSavedScreenMagnifierScale(); @@ -167,8 +167,7 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate { return std::numeric_limits<double>::min(); } - virtual void TriggerAccessibilityAlert( - ui::AccessibilityAlert alert) override { + void TriggerAccessibilityAlert(ui::AccessibilityAlert alert) override { Profile* profile = ProfileManager::GetActiveUserProfile(); if (profile) { switch (alert) { @@ -198,16 +197,16 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate { } } - virtual ui::AccessibilityAlert GetLastAccessibilityAlert() override { + ui::AccessibilityAlert GetLastAccessibilityAlert() override { return ui::A11Y_ALERT_NONE; } - virtual void PlayEarcon(int sound_key) override { + void PlayEarcon(int sound_key) override { DCHECK(chromeos::AccessibilityManager::Get()); return chromeos::AccessibilityManager::Get()->PlayEarcon(sound_key); } - virtual base::TimeDelta PlayShutdownSound() const override { + base::TimeDelta PlayShutdownSound() const override { return chromeos::AccessibilityManager::Get()->PlayShutdownSound(); } diff --git a/chrome/browser/ui/ash/ime_controller_chromeos.h b/chrome/browser/ui/ash/ime_controller_chromeos.h index 4616b08..15480b0 100644 --- a/chrome/browser/ui/ash/ime_controller_chromeos.h +++ b/chrome/browser/ui/ash/ime_controller_chromeos.h @@ -14,16 +14,15 @@ class ImeController : public ash::ImeControlDelegate { public: ImeController() {} - virtual ~ImeController() {} + ~ImeController() override {} // Overridden from ash::ImeControlDelegate: - virtual bool CanCycleIme() override; - virtual void HandleNextIme() override; - virtual void HandlePreviousIme() override; - virtual bool CanSwitchIme(const ui::Accelerator& accelerator) override; - virtual void HandleSwitchIme(const ui::Accelerator& accelerator) override; - virtual ui::Accelerator RemapAccelerator( - const ui::Accelerator& accelerator) override; + bool CanCycleIme() override; + void HandleNextIme() override; + void HandlePreviousIme() override; + bool CanSwitchIme(const ui::Accelerator& accelerator) override; + void HandleSwitchIme(const ui::Accelerator& accelerator) override; + ui::Accelerator RemapAccelerator(const ui::Accelerator& accelerator) override; private: bool UsingFrenchInputMethod() const; diff --git a/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc b/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc index 63de4af..39217f1 100644 --- a/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc @@ -15,16 +15,16 @@ class ImeControllerTest : public testing::Test { public: ImeControllerTest() : mock_input_method_manager_(NULL) {} - virtual ~ImeControllerTest() {} + ~ImeControllerTest() override {} - virtual void SetUp() override { + void SetUp() override { mock_input_method_manager_ = new chromeos::input_method::MockInputMethodManager; chromeos::input_method::InitializeForTesting( mock_input_method_manager_); } - virtual void TearDown() override { + void TearDown() override { chromeos::input_method::Shutdown(); mock_input_method_manager_ = NULL; } diff --git a/chrome/browser/ui/ash/keyboard_controller_browsertest.cc b/chrome/browser/ui/ash/keyboard_controller_browsertest.cc index 89cc9ce..1144c91 100644 --- a/chrome/browser/ui/ash/keyboard_controller_browsertest.cc +++ b/chrome/browser/ui/ash/keyboard_controller_browsertest.cc @@ -21,15 +21,15 @@ const int kKeyboardHeightForTest = 100; class VirtualKeyboardWebContentTest : public InProcessBrowserTest { public: VirtualKeyboardWebContentTest() {}; - virtual ~VirtualKeyboardWebContentTest() {}; + ~VirtualKeyboardWebContentTest() override{}; - virtual void SetUp() override { + void SetUp() override { ui::SetUpInputMethodFactoryForTesting(); InProcessBrowserTest::SetUp(); } // Ensure that the virtual keyboard is enabled. - virtual void SetUpCommandLine(base::CommandLine* command_line) override { + void SetUpCommandLine(base::CommandLine* command_line) override { command_line->AppendSwitch( keyboard::switches::kEnableVirtualKeyboard); } diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc index 002b6d0..2846cb7c 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc @@ -286,16 +286,15 @@ class ChromeLauncherControllerUserSwitchObserverChromeOS registrar_.Add(this, chrome::NOTIFICATION_PROFILE_ADDED, content::NotificationService::AllSources()); } - virtual ~ChromeLauncherControllerUserSwitchObserverChromeOS() { + ~ChromeLauncherControllerUserSwitchObserverChromeOS() override { user_manager::UserManager::Get()->RemoveSessionStateObserver(this); } // user_manager::UserManager::UserSessionStateObserver overrides: - virtual void UserAddedToSession( - const user_manager::User* added_user) override; + void UserAddedToSession(const user_manager::User* added_user) override; // content::NotificationObserver overrides: - virtual void Observe(int type, + void Observe(int type, const content::NotificationSource& source, const content::NotificationDetails& details) override; diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc index f5c1267..f7018d3 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc @@ -79,8 +79,7 @@ class TestEvent : public ui::Event { explicit TestEvent(ui::EventType type) : ui::Event(type, base::TimeDelta(), 0) { } - virtual ~TestEvent() { - } + ~TestEvent() override {} private: DISALLOW_COPY_AND_ASSIGN(TestEvent); @@ -94,12 +93,12 @@ class TestAppWindowRegistryObserver extensions::AppWindowRegistry::Get(profile_)->AddObserver(this); } - virtual ~TestAppWindowRegistryObserver() { + ~TestAppWindowRegistryObserver() override { extensions::AppWindowRegistry::Get(profile_)->RemoveObserver(this); } // Overridden from AppWindowRegistry::Observer: - virtual void OnAppWindowIconChanged(AppWindow* app_window) override { + void OnAppWindowIconChanged(AppWindow* app_window) override { ++icon_updates_; } @@ -147,9 +146,9 @@ class LauncherPlatformAppBrowserTest LauncherPlatformAppBrowserTest() : shelf_(NULL), controller_(NULL) { } - virtual ~LauncherPlatformAppBrowserTest() {} + ~LauncherPlatformAppBrowserTest() override {} - virtual void RunTestOnMainThreadLoop() override { + void RunTestOnMainThreadLoop() override { shelf_ = ash::Shelf::ForPrimaryDisplay(); controller_ = ChromeLauncherController::instance(); return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop(); @@ -222,9 +221,9 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest { ShelfAppBrowserTest() : shelf_(NULL), model_(NULL), controller_(NULL) { } - virtual ~ShelfAppBrowserTest() {} + ~ShelfAppBrowserTest() override {} - virtual void RunTestOnMainThreadLoop() override { + void RunTestOnMainThreadLoop() override { shelf_ = ash::Shelf::ForPrimaryDisplay(); model_ = ash::test::ShellTestApi(ash::Shell::GetInstance()).shelf_model(); controller_ = ChromeLauncherController::instance(); @@ -340,9 +339,9 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest { class ShelfAppBrowserTestNoDefaultBrowser : public ShelfAppBrowserTest { protected: ShelfAppBrowserTestNoDefaultBrowser() {} - virtual ~ShelfAppBrowserTestNoDefaultBrowser() {} + ~ShelfAppBrowserTestNoDefaultBrowser() override {} - virtual void SetUpCommandLine(base::CommandLine* command_line) override { + void SetUpCommandLine(base::CommandLine* command_line) override { ShelfAppBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kNoStartupWindow); } @@ -357,9 +356,9 @@ class ShelfAppBrowserTestNoDefaultBrowser : public ShelfAppBrowserTest { class ShelfAppBrowserNoMinimizeOnClick : public LauncherPlatformAppBrowserTest { protected: ShelfAppBrowserNoMinimizeOnClick() {} - virtual ~ShelfAppBrowserNoMinimizeOnClick() {} + ~ShelfAppBrowserNoMinimizeOnClick() override {} - virtual void SetUpCommandLine(base::CommandLine* command_line) override { + void SetUpCommandLine(base::CommandLine* command_line) override { LauncherPlatformAppBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch( switches::kDisableMinimizeOnSecondLauncherItemClick); @@ -1763,9 +1762,9 @@ class ShelfAppBrowserTestWithMultiMonitor : public ShelfAppBrowserTestNoDefaultBrowser { protected: ShelfAppBrowserTestWithMultiMonitor() {} - virtual ~ShelfAppBrowserTestWithMultiMonitor() {} + ~ShelfAppBrowserTestWithMultiMonitor() override {} - virtual void SetUpCommandLine(base::CommandLine* command_line) override { + void SetUpCommandLine(base::CommandLine* command_line) override { ShelfAppBrowserTestNoDefaultBrowser::SetUpCommandLine(command_line); command_line->AppendSwitchASCII("ash-host-window-bounds", "800x800,801+0-800x800"); diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc index b4674b3..930954b 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc @@ -619,9 +619,9 @@ class TestBrowserWindowAura : public TestBrowserWindow { explicit TestBrowserWindowAura(aura::Window* native_window) : native_window_(native_window) { } - virtual ~TestBrowserWindowAura() {} + ~TestBrowserWindowAura() override {} - virtual gfx::NativeWindow GetNativeWindow() const override { + gfx::NativeWindow GetNativeWindow() const override { return native_window_.get(); } @@ -665,7 +665,7 @@ class WebContentsDestroyedWatcher : public content::WebContentsObserver { message_loop_runner_(new content::MessageLoopRunner) { EXPECT_TRUE(web_contents != NULL); } - virtual ~WebContentsDestroyedWatcher() {} + ~WebContentsDestroyedWatcher() override {} // Waits until the WebContents is destroyed. void Wait() { @@ -674,9 +674,7 @@ class WebContentsDestroyedWatcher : public content::WebContentsObserver { private: // Overridden WebContentsObserver methods. - virtual void WebContentsDestroyed() override { - message_loop_runner_->Quit(); - } + void WebContentsDestroyed() override { message_loop_runner_->Quit(); } scoped_refptr<content::MessageLoopRunner> message_loop_runner_; @@ -707,7 +705,7 @@ class V1App : public TestBrowserWindow { chrome::AddTabAt(browser_.get(), GURL(), 0, true); } - virtual ~V1App() { + ~V1App() override { // close all tabs. Note that we do not need to destroy the browser itself. browser_->tab_strip_model()->CloseAllTabs(); } @@ -715,7 +713,7 @@ class V1App : public TestBrowserWindow { Browser* browser() { return browser_.get(); } // TestBrowserWindow override: - virtual gfx::NativeWindow GetNativeWindow() const override { + gfx::NativeWindow GetNativeWindow() const override { return native_window_.get(); } @@ -768,11 +766,10 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest() { } - virtual ~MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest() { - } + ~MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest() override {} // Overwrite the Setup function to enable multi profile and needed objects. - virtual void SetUp() override { + void SetUp() override { profile_manager_.reset( new TestingProfileManager(TestingBrowserProcess::GetGlobal())); @@ -795,7 +792,7 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest shell_delegate_->set_multi_profiles_enabled(true); } - virtual void TearDown() { + void TearDown() override { ChromeLauncherControllerTest::TearDown(); user_manager_enabler_.reset(); for (ProfileToNameMap::iterator it = created_profiles_.begin(); @@ -894,10 +891,10 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest ash::test::TestShellDelegate* shell_delegate() { return shell_delegate_; } // Override BrowserWithTestWindowTest: - virtual TestingProfile* CreateProfile() override { + TestingProfile* CreateProfile() override { return CreateMultiUserProfile("user1"); } - virtual void DestroyProfile(TestingProfile* profile) override { + void DestroyProfile(TestingProfile* profile) override { // Delete the profile through our profile manager. ProfileToNameMap::iterator it = created_profiles_.find(profile); DCHECK(it != created_profiles_.end()); diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc index aafdab0..85a93a2 100644 --- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc @@ -29,7 +29,7 @@ class ContentsObserver : public WebContentsObserver { got_favicons_(false) { } - virtual ~ContentsObserver() {} + ~ContentsObserver() override {} void Reset() { got_favicons_ = false; @@ -39,12 +39,12 @@ class ContentsObserver : public WebContentsObserver { bool got_favicons() const { return got_favicons_; } // WebContentsObserver overrides. - virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host, - const GURL& validated_url) override { + void DidFinishLoad(content::RenderFrameHost* render_frame_host, + const GURL& validated_url) override { loaded_ = true; } - virtual void DidUpdateFaviconURL( + void DidUpdateFaviconURL( const std::vector<content::FaviconURL>& candidates) override { if (!candidates.empty()) got_favicons_ = true; @@ -64,10 +64,9 @@ class LauncherFaviconLoaderBrowsertest LauncherFaviconLoaderBrowsertest() : favicon_updated_(false) { } - virtual ~LauncherFaviconLoaderBrowsertest() { - } + ~LauncherFaviconLoaderBrowsertest() override {} - virtual void SetUpOnMainThread() override { + void SetUpOnMainThread() override { WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); contents_observer_.reset(new ContentsObserver(web_contents)); @@ -75,9 +74,7 @@ class LauncherFaviconLoaderBrowsertest } // LauncherFaviconLoader::Delegate overrides: - virtual void FaviconUpdated() override { - favicon_updated_ = true; - } + void FaviconUpdated() override { favicon_updated_ = true; } protected: bool NavigateTo(const char* url) { diff --git a/chrome/browser/ui/ash/media_delegate_chromeos.h b/chrome/browser/ui/ash/media_delegate_chromeos.h index f2fab1e..673af91 100644 --- a/chrome/browser/ui/ash/media_delegate_chromeos.h +++ b/chrome/browser/ui/ash/media_delegate_chromeos.h @@ -13,20 +13,20 @@ class MediaDelegateChromeOS : public ash::MediaDelegate, MediaCaptureDevicesDispatcher::Observer { public: MediaDelegateChromeOS(); - virtual ~MediaDelegateChromeOS(); + ~MediaDelegateChromeOS() override; // ash::MediaDelegate: - virtual void HandleMediaNextTrack() override; - virtual void HandleMediaPlayPause() override; - virtual void HandleMediaPrevTrack() override; - virtual ash::MediaCaptureState GetMediaCaptureState( + void HandleMediaNextTrack() override; + void HandleMediaPlayPause() override; + void HandleMediaPrevTrack() override; + ash::MediaCaptureState GetMediaCaptureState( content::BrowserContext* context) override; // MediaCaptureDevicesDispatcher::Observer: - virtual void OnRequestUpdate(int render_process_id, - int render_frame_id, - content::MediaStreamType stream_type, - const content::MediaRequestState state) override; + void OnRequestUpdate(int render_process_id, + int render_frame_id, + content::MediaStreamType stream_type, + const content::MediaRequestState state) override; private: void NotifyMediaCaptureChange(); diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc index e3c3be8..83c70f8 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc @@ -33,21 +33,16 @@ class MultiUserContextMenuChromeos : public ui::SimpleMenuModel, public ui::SimpleMenuModel::Delegate { public: explicit MultiUserContextMenuChromeos(aura::Window* window); - virtual ~MultiUserContextMenuChromeos() {} + ~MultiUserContextMenuChromeos() override {} // SimpleMenuModel::Delegate: - virtual bool IsCommandIdChecked(int command_id) const override { + bool IsCommandIdChecked(int command_id) const override { return false; } + bool IsCommandIdEnabled(int command_id) const override { return true; } + bool GetAcceleratorForCommandId(int command_id, + ui::Accelerator* accelerator) override { return false; } - virtual bool IsCommandIdEnabled(int command_id) const override { - return true; - } - virtual bool GetAcceleratorForCommandId( - int command_id, - ui::Accelerator* accelerator) override { - return false; - } - virtual void ExecuteCommand(int command_id, int event_flags) override; + void ExecuteCommand(int command_id, int event_flags) override; private: // The window for which this menu is. diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc index 1cc7f71..038a2b4 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc @@ -24,8 +24,8 @@ class MultiUserContextMenuChromeOSTest : public AshTestBase { public: MultiUserContextMenuChromeOSTest() : multi_user_window_manager_(NULL) {} - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; protected: // Set up the test environment for this many windows. diff --git a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h index 54f08d5..3afc8eb 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h +++ b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h @@ -19,15 +19,15 @@ class MultiUserNotificationBlockerChromeOS MultiUserNotificationBlockerChromeOS( message_center::MessageCenter* message_center, const std::string& initial_user_id); - virtual ~MultiUserNotificationBlockerChromeOS(); + ~MultiUserNotificationBlockerChromeOS() override; // Called by MultiUserWindowManager when the active user has changed. void ActiveUserChanged(const std::string& user_id); // message_center::NotificationBlocker overrides: - virtual bool ShouldShowNotification( + bool ShouldShowNotification( const message_center::NotifierId& notifier_id) const override; - virtual bool ShouldShowNotificationAsPopup( + bool ShouldShowNotificationAsPopup( const message_center::NotifierId& notifier_id) const override; private: diff --git a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc index f11ab98..28bed7c 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc @@ -24,10 +24,10 @@ class MultiUserNotificationBlockerChromeOSTest : state_changed_count_(0), testing_profile_manager_(TestingBrowserProcess::GetGlobal()), window_id_(0) {} - virtual ~MultiUserNotificationBlockerChromeOSTest() {} + ~MultiUserNotificationBlockerChromeOSTest() override {} // ash::test::AshTestBase overrides: - virtual void SetUp() override { + void SetUp() override { ash::test::AshTestBase::SetUp(); ASSERT_TRUE(testing_profile_manager_.SetUp()); @@ -51,7 +51,7 @@ class MultiUserNotificationBlockerChromeOSTest GetMultiUserWindowManager()->notification_blocker_->AddObserver(this); } - virtual void TearDown() override { + void TearDown() override { GetMultiUserWindowManager()->notification_blocker_->RemoveObserver(this); if (chrome::MultiUserWindowManager::GetInstance()) chrome::MultiUserWindowManager::DeleteInstance(); @@ -59,7 +59,7 @@ class MultiUserNotificationBlockerChromeOSTest } // message_center::NotificationBlocker::Observer ovverrides: - virtual void OnBlockingStateChanged( + void OnBlockingStateChanged( message_center::NotificationBlocker* blocker) override { state_changed_count_++; } diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc index bfe43d3..43e92626 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc @@ -192,10 +192,10 @@ class AnimationSetter { class AppObserver : public extensions::AppWindowRegistry::Observer { public: explicit AppObserver(const std::string& user_id) : user_id_(user_id) {} - virtual ~AppObserver() {} + ~AppObserver() override {} // AppWindowRegistry::Observer overrides: - virtual void OnAppWindowAdded(extensions::AppWindow* app_window) override { + void OnAppWindowAdded(extensions::AppWindow* app_window) override { aura::Window* window = app_window->GetNativeWindow(); DCHECK(window); MultiUserWindowManagerChromeOS::GetInstance()->SetWindowOwner(window, diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h index 59d81b7..d3d0b57 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h @@ -70,7 +70,7 @@ class MultiUserWindowManagerChromeOS // Create the manager and use |active_user_id| as the active user. explicit MultiUserWindowManagerChromeOS(const std::string& active_user_id); - virtual ~MultiUserWindowManagerChromeOS(); + ~MultiUserWindowManagerChromeOS() override; // MultiUserWindowManager overrides: void SetWindowOwner( diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc index 5b58d47..0fbe706 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc @@ -40,8 +40,8 @@ class MultiUserWindowManagerChromeOSTest : public AshTestBase { : multi_user_window_manager_(NULL), session_state_delegate_(NULL) {} - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; protected: // Set up the test environment for this many windows. @@ -1043,11 +1043,11 @@ TEST_F(MultiUserWindowManagerChromeOSTest, ShowForUserSwitchesDesktop) { class TestWindowObserver : public aura::WindowObserver { public: TestWindowObserver(): resize_calls_(0) {} - virtual ~TestWindowObserver() {}; + ~TestWindowObserver() override{}; - virtual void OnWindowBoundsChanged(aura::Window* window, - const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) override { + void OnWindowBoundsChanged(aura::Window* window, + const gfx::Rect& old_bounds, + const gfx::Rect& new_bounds) override { resize_calls_++; } diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.h b/chrome/browser/ui/ash/session_state_delegate_chromeos.h index 114bcde..9e7847f 100644 --- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h +++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h @@ -24,49 +24,45 @@ class SessionStateDelegateChromeos public chromeos::UserAddingScreen::Observer { public: SessionStateDelegateChromeos(); - virtual ~SessionStateDelegateChromeos(); + ~SessionStateDelegateChromeos() override; // ash::SessionStateDelegate: - virtual content::BrowserContext* GetBrowserContextByIndex( + content::BrowserContext* GetBrowserContextByIndex( ash::MultiProfileIndex index) override; - virtual content::BrowserContext* GetBrowserContextForWindow( + content::BrowserContext* GetBrowserContextForWindow( aura::Window* window) override; - virtual int GetMaximumNumberOfLoggedInUsers() const override; - virtual int NumberOfLoggedInUsers() const override; - virtual bool CanAddUserToMultiProfile(AddUserError* error) const override; - virtual bool IsActiveUserSessionStarted() const override; - virtual bool CanLockScreen() const override; - virtual bool IsScreenLocked() const override; - virtual bool ShouldLockScreenBeforeSuspending() const override; - virtual void LockScreen() override; - virtual void UnlockScreen() override; - virtual bool IsUserSessionBlocked() const override; - virtual SessionState GetSessionState() const override; - virtual const user_manager::UserInfo* GetUserInfo( + int GetMaximumNumberOfLoggedInUsers() const override; + int NumberOfLoggedInUsers() const override; + bool CanAddUserToMultiProfile(AddUserError* error) const override; + bool IsActiveUserSessionStarted() const override; + bool CanLockScreen() const override; + bool IsScreenLocked() const override; + bool ShouldLockScreenBeforeSuspending() const override; + void LockScreen() override; + void UnlockScreen() override; + bool IsUserSessionBlocked() const override; + SessionState GetSessionState() const override; + const user_manager::UserInfo* GetUserInfo( ash::MultiProfileIndex index) const override; - virtual const user_manager::UserInfo* GetUserInfo( + const user_manager::UserInfo* GetUserInfo( content::BrowserContext* context) const override; - virtual bool ShouldShowAvatar(aura::Window* window) const override; - virtual void SwitchActiveUser(const std::string& user_id) override; - virtual void CycleActiveUser(CycleUser cycle_user) override; - virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const override; - virtual void AddSessionStateObserver( - ash::SessionStateObserver* observer) override; - virtual void RemoveSessionStateObserver( - ash::SessionStateObserver* observer) override; + bool ShouldShowAvatar(aura::Window* window) const override; + void SwitchActiveUser(const std::string& user_id) override; + void CycleActiveUser(CycleUser cycle_user) override; + bool IsMultiProfileAllowedByPrimaryUserPolicy() const override; + void AddSessionStateObserver(ash::SessionStateObserver* observer) override; + void RemoveSessionStateObserver(ash::SessionStateObserver* observer) override; // chromeos::LoginState::Observer overrides. - virtual void LoggedInStateChanged() override; + void LoggedInStateChanged() override; // user_manager::UserManager::UserSessionStateObserver: - virtual void ActiveUserChanged( - const user_manager::User* active_user) override; - virtual void UserAddedToSession( - const user_manager::User* added_user) override; + void ActiveUserChanged(const user_manager::User* active_user) override; + void UserAddedToSession(const user_manager::User* added_user) override; // chromeos::UserAddingScreen::Observer: - virtual void OnUserAddingStarted() override; - virtual void OnUserAddingFinished() override; + void OnUserAddingStarted() override; + void OnUserAddingFinished() override; private: // Sets session state to |new_state|. diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc index e8883c8..8f0b79f 100644 --- a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc @@ -47,10 +47,9 @@ class SessionStateDelegateChromeOSTest : public testing::Test { SessionStateDelegateChromeOSTest() : user_manager_(NULL) { } - virtual ~SessionStateDelegateChromeOSTest() { - } + ~SessionStateDelegateChromeOSTest() override {} - virtual void SetUp() override { + void SetUp() override { // Initialize the UserManager singleton to a fresh FakeUserManager instance. user_manager_ = new chromeos::FakeUserManager; user_manager_enabler_.reset( @@ -61,7 +60,7 @@ class SessionStateDelegateChromeOSTest : public testing::Test { testing::Test::SetUp(); } - virtual void TearDown() override { + void TearDown() override { testing::Test::TearDown(); session_state_delegate_.reset(); user_manager_enabler_.reset(); diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc index 5f4bb8a..3b2ea6a 100644 --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc @@ -52,7 +52,7 @@ class SystemTrayDelegateChromeOSTest : public LoginManagerTest { SystemTrayDelegateChromeOSTest() : LoginManagerTest(false /* should_launch_browser */) {} - virtual ~SystemTrayDelegateChromeOSTest() {} + ~SystemTrayDelegateChromeOSTest() override {} void SetupUserProfile(std::string user_name, bool use_24_hour_clock) { const user_manager::User* user = diff --git a/chrome/browser/ui/ash/user_accounts_delegate_chromeos.h b/chrome/browser/ui/ash/user_accounts_delegate_chromeos.h index 41ef5f6..c25663e 100644 --- a/chrome/browser/ui/ash/user_accounts_delegate_chromeos.h +++ b/chrome/browser/ui/ash/user_accounts_delegate_chromeos.h @@ -18,19 +18,18 @@ class UserAccountsDelegateChromeOS : public ash::tray::UserAccountsDelegate, public OAuth2TokenService::Observer { public: explicit UserAccountsDelegateChromeOS(Profile* user_profile); - virtual ~UserAccountsDelegateChromeOS(); + ~UserAccountsDelegateChromeOS() override; // Overridden from ash::tray::UserAccountsDelegate: - virtual std::string GetPrimaryAccountId() override; - virtual std::vector<std::string> GetSecondaryAccountIds() override; - virtual std::string GetAccountDisplayName( - const std::string& account_id) override; - virtual void DeleteAccount(const std::string& account_id) override; - virtual void LaunchAddAccountDialog() override; + std::string GetPrimaryAccountId() override; + std::vector<std::string> GetSecondaryAccountIds() override; + std::string GetAccountDisplayName(const std::string& account_id) override; + void DeleteAccount(const std::string& account_id) override; + void LaunchAddAccountDialog() override; // Overridden from OAuth2TokenServiceObserver: - virtual void OnRefreshTokenAvailable(const std::string& account_id) override; - virtual void OnRefreshTokenRevoked(const std::string& account_id) override; + void OnRefreshTokenAvailable(const std::string& account_id) override; + void OnRefreshTokenRevoked(const std::string& account_id) override; private: Profile* user_profile_; diff --git a/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc b/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc index 2f41b9e..d94f7d0 100644 --- a/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc +++ b/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc @@ -27,20 +27,19 @@ class SoundsManagerTestImpl : public media::SoundsManager { num_play_requests_(chromeos::SOUND_COUNT) { } - virtual ~SoundsManagerTestImpl() {} + ~SoundsManagerTestImpl() override {} - virtual bool Initialize(SoundKey key, - const base::StringPiece& /* data */) override { + bool Initialize(SoundKey key, const base::StringPiece& /* data */) override { is_sound_initialized_[key] = true; return true; } - virtual bool Play(SoundKey key) override { + bool Play(SoundKey key) override { ++num_play_requests_[key]; return true; } - virtual base::TimeDelta GetDuration(SoundKey /* key */) override { + base::TimeDelta GetDuration(SoundKey /* key */) override { return base::TimeDelta(); } @@ -62,9 +61,9 @@ class SoundsManagerTestImpl : public media::SoundsManager { class VolumeControllerTest : public InProcessBrowserTest { public: VolumeControllerTest() {} - virtual ~VolumeControllerTest() {} + ~VolumeControllerTest() override {} - virtual void SetUpOnMainThread() override { + void SetUpOnMainThread() override { volume_controller_.reset(new VolumeController()); audio_handler_ = chromeos::CrasAudioHandler::Get(); } @@ -161,9 +160,9 @@ IN_PROC_BROWSER_TEST_F(VolumeControllerTest, Mutes) { class VolumeControllerSoundsTest : public VolumeControllerTest { public: VolumeControllerSoundsTest() : sounds_manager_(NULL) {} - virtual ~VolumeControllerSoundsTest() {} + ~VolumeControllerSoundsTest() override {} - virtual void SetUpInProcessBrowserTestFixture() override { + void SetUpInProcessBrowserTestFixture() override { sounds_manager_ = new SoundsManagerTestImpl(); media::SoundsManager::InitializeForTesting(sounds_manager_); } @@ -237,9 +236,9 @@ IN_PROC_BROWSER_TEST_F(VolumeControllerSoundsTest, EdgeCases) { class VolumeControllerSoundsDisabledTest : public VolumeControllerSoundsTest { public: VolumeControllerSoundsDisabledTest() {} - virtual ~VolumeControllerSoundsDisabledTest() {} + ~VolumeControllerSoundsDisabledTest() override {} - virtual void SetUpCommandLine(base::CommandLine* command_line) override { + void SetUpCommandLine(base::CommandLine* command_line) override { VolumeControllerSoundsTest::SetUpCommandLine(command_line); command_line->AppendSwitch(chromeos::switches::kDisableVolumeAdjustSound); } diff --git a/chrome/browser/ui/ash/volume_controller_chromeos.h b/chrome/browser/ui/ash/volume_controller_chromeos.h index 31c68ac..3a29b89 100644 --- a/chrome/browser/ui/ash/volume_controller_chromeos.h +++ b/chrome/browser/ui/ash/volume_controller_chromeos.h @@ -16,16 +16,16 @@ class VolumeController : public ash::VolumeControlDelegate, public chromeos::CrasAudioHandler::AudioObserver { public: VolumeController(); - virtual ~VolumeController(); + ~VolumeController() override; // Overridden from ash::VolumeControlDelegate: - virtual void HandleVolumeMute(const ui::Accelerator& accelerator) override; - virtual void HandleVolumeDown(const ui::Accelerator& accelerator) override; - virtual void HandleVolumeUp(const ui::Accelerator& accelerator) override; + void HandleVolumeMute(const ui::Accelerator& accelerator) override; + void HandleVolumeDown(const ui::Accelerator& accelerator) override; + void HandleVolumeUp(const ui::Accelerator& accelerator) override; // Overridden from chromeos::CrasAudioHandler::AudioObserver. - virtual void OnOutputVolumeChanged() override; - virtual void OnOutputMuteChanged() override; + void OnOutputVolumeChanged() override; + void OnOutputMuteChanged() override; private: diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc index 025f9ea..695cc58 100644 --- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc +++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc @@ -25,7 +25,7 @@ GURL GetGoogleURL() { // Subclass that tests navigation while in the Guest session. class BrowserGuestSessionNavigatorTest: public BrowserNavigatorTest { protected: - virtual void SetUpCommandLine(base::CommandLine* command_line) override { + void SetUpCommandLine(base::CommandLine* command_line) override { base::CommandLine command_line_copy = *command_line; command_line_copy.AppendSwitchASCII( chromeos::switches::kLoginProfile, "user"); diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc index 4b6866a3..85d8a0d 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc @@ -38,10 +38,10 @@ class ImmersiveModeControllerAshTest : public TestWithBrowserView { host_desktop_type, hosted_app) { } - virtual ~ImmersiveModeControllerAshTest() {} + ~ImmersiveModeControllerAshTest() override {} // TestWithBrowserView override: - virtual void SetUp() override { + void SetUp() override { TestWithBrowserView::SetUp(); browser()->window()->Show(); @@ -276,7 +276,7 @@ class ImmersiveModeControllerAshTestHostedApp chrome::HOST_DESKTOP_TYPE_ASH, true) { } - virtual ~ImmersiveModeControllerAshTestHostedApp() {} + ~ImmersiveModeControllerAshTestHostedApp() override {} private: DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAshTestHostedApp); diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc index cdcff2a..76636d5 100644 --- a/chrome/browser/ui/views/keyboard_access_browsertest.cc +++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc @@ -51,7 +51,7 @@ class ViewFocusChangeWaiter : public views::FocusChangeListener { OnWillChangeFocus(NULL, focus_manager_->GetFocusedView()); } - virtual ~ViewFocusChangeWaiter() { + ~ViewFocusChangeWaiter() override { focus_manager_->RemoveFocusChangeListener(this); } @@ -61,12 +61,11 @@ class ViewFocusChangeWaiter : public views::FocusChangeListener { private: // Inherited from FocusChangeListener - virtual void OnWillChangeFocus(views::View* focused_before, - views::View* focused_now) override { - } + void OnWillChangeFocus(views::View* focused_before, + views::View* focused_now) override {} - virtual void OnDidChangeFocus(views::View* focused_before, - views::View* focused_now) override { + void OnDidChangeFocus(views::View* focused_before, + views::View* focused_now) override { if (focused_now && focused_now->id() != previous_view_id_) { base::MessageLoop::current()->PostTask(FROM_HERE, base::MessageLoop::QuitClosure()); @@ -90,7 +89,7 @@ class SendKeysMenuListener : public views::MenuListener { toolbar_view_->AddMenuListener(this); } - virtual ~SendKeysMenuListener() { + ~SendKeysMenuListener() override { if (test_dismiss_menu_) toolbar_view_->RemoveMenuListener(this); } @@ -101,7 +100,7 @@ class SendKeysMenuListener : public views::MenuListener { private: // Overridden from views::MenuListener: - virtual void OnMenuOpened() override { + void OnMenuOpened() override { menu_open_count_++; if (!test_dismiss_menu_) { toolbar_view_->RemoveMenuListener(this); diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h index 37cec92..2be2ad33 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h @@ -165,9 +165,9 @@ class OmniboxViewViews // chromeos::input_method::InputMethodManager::CandidateWindowObserver: #if defined(OS_CHROMEOS) - virtual void CandidateWindowOpened( + void CandidateWindowOpened( chromeos::input_method::InputMethodManager* manager) override; - virtual void CandidateWindowClosed( + void CandidateWindowClosed( chromeos::input_method::InputMethodManager* manager) override; #endif diff --git a/chrome/browser/ui/views/select_file_dialog_extension.h b/chrome/browser/ui/views/select_file_dialog_extension.h index 1e6d191..8d70add 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension.h +++ b/chrome/browser/ui/views/select_file_dialog_extension.h @@ -43,12 +43,12 @@ class SelectFileDialogExtension ui::SelectFilePolicy* policy); // BaseShellDialog implementation. - virtual bool IsRunning(gfx::NativeWindow owner_window) const override; - virtual void ListenerDestroyed() override; + bool IsRunning(gfx::NativeWindow owner_window) const override; + void ListenerDestroyed() override; // ExtensionDialog::Observer implementation. - virtual void ExtensionDialogClosing(ExtensionDialog* dialog) override; - virtual void ExtensionTerminated(ExtensionDialog* dialog) override; + void ExtensionDialogClosing(ExtensionDialog* dialog) override; + void ExtensionTerminated(ExtensionDialog* dialog) override; // Routes callback to appropriate SelectFileDialog::Listener based on the // owning |web_contents|. @@ -65,15 +65,14 @@ class SelectFileDialogExtension protected: // SelectFileDialog implementation. - virtual void SelectFileImpl( - Type type, - const base::string16& title, - const base::FilePath& default_path, - const FileTypeInfo* file_types, - int file_type_index, - const base::FilePath::StringType& default_extension, - gfx::NativeWindow owning_window, - void* params) override; + void SelectFileImpl(Type type, + const base::string16& title, + const base::FilePath& default_path, + const FileTypeInfo* file_types, + int file_type_index, + const base::FilePath::StringType& default_extension, + gfx::NativeWindow owning_window, + void* params) override; private: friend class SelectFileDialogExtensionBrowserTest; @@ -82,7 +81,7 @@ class SelectFileDialogExtension // Object is ref-counted, use Create(). explicit SelectFileDialogExtension(SelectFileDialog::Listener* listener, ui::SelectFilePolicy* policy); - virtual ~SelectFileDialogExtension(); + ~SelectFileDialogExtension() override; // Invokes the appropriate file selection callback on our listener. void NotifyListener(); @@ -94,7 +93,7 @@ class SelectFileDialogExtension static bool PendingExists(RoutingID routing_id); // Returns true if the dialog has multiple file type choices. - virtual bool HasMultipleFileTypeChoicesImpl() override; + bool HasMultipleFileTypeChoicesImpl() override; bool has_multiple_file_type_choices_; diff --git a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc index 81a7b7f..ca1bec9 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc @@ -48,22 +48,21 @@ class MockSelectFileDialogListener : public ui::SelectFileDialog::Listener { void* params() const { return params_; } // ui::SelectFileDialog::Listener implementation. - virtual void FileSelected(const base::FilePath& path, - int index, - void* params) override { + void FileSelected(const base::FilePath& path, + int index, + void* params) override { file_selected_ = true; path_ = path; params_ = params; } - virtual void FileSelectedWithExtraInfo( - const ui::SelectedFileInfo& selected_file_info, - int index, - void* params) override { + void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& selected_file_info, + int index, + void* params) override { FileSelected(selected_file_info.local_path, index, params); } - virtual void MultiFilesSelected( - const std::vector<base::FilePath>& files, void* params) override {} - virtual void FileSelectionCanceled(void* params) override { + void MultiFilesSelected(const std::vector<base::FilePath>& files, + void* params) override {} + void FileSelectionCanceled(void* params) override { canceled_ = true; params_ = params; } @@ -84,7 +83,7 @@ class SelectFileDialogExtensionBrowserTest : public ExtensionBrowserTest { DIALOG_BTN_CANCEL }; - virtual void SetUp() override { + void SetUp() override { extensions::ComponentLoader::EnableBackgroundExtensionsForTesting(); // Create the dialog wrapper object, but don't show it yet. @@ -103,7 +102,7 @@ class SelectFileDialogExtensionBrowserTest : public ExtensionBrowserTest { ExtensionBrowserTest::SetUp(); } - virtual void TearDown() override { + void TearDown() override { ExtensionBrowserTest::TearDown(); // Delete the dialog first, as it holds a pointer to the listener. diff --git a/chrome/browser/ui/views/select_file_dialog_extension_factory.h b/chrome/browser/ui/views/select_file_dialog_extension_factory.h index 841c2c5..4418e3a 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_factory.h +++ b/chrome/browser/ui/views/select_file_dialog_extension_factory.h @@ -11,13 +11,12 @@ class SelectFileDialogExtensionFactory : public ui::SelectFileDialogFactory { public: SelectFileDialogExtensionFactory(); - virtual ~SelectFileDialogExtensionFactory(); + ~SelectFileDialogExtensionFactory() override; private: // Override from ui::SelectFileDialogFactory: - virtual ui::SelectFileDialog* Create( - ui::SelectFileDialog::Listener* listener, - ui::SelectFilePolicy* policy) override; + ui::SelectFileDialog* Create(ui::SelectFileDialog::Listener* listener, + ui::SelectFilePolicy* policy) override; DISALLOW_COPY_AND_ASSIGN(SelectFileDialogExtensionFactory); }; diff --git a/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc b/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc index 0da91f1..502ac26 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc @@ -19,7 +19,7 @@ const SelectFileDialogExtension::RoutingID kDefaultRoutingID = class SelectFileDialogExtensionTest : public testing::Test { public: SelectFileDialogExtensionTest() {} - virtual ~SelectFileDialogExtensionTest() {} + ~SelectFileDialogExtensionTest() override {} static SelectFileDialogExtension* CreateDialog( ui::SelectFileDialog::Listener* listener) { @@ -40,15 +40,15 @@ class SelectFileDialogExtensionTest : public testing::Test { class TestListener : public ui::SelectFileDialog::Listener { public: TestListener() : selected_(false), file_index_(-1) {} - virtual ~TestListener() {} + ~TestListener() override {} bool selected() const { return selected_; } int file_index() const { return file_index_; } // ui::SelectFileDialog::Listener implementation - virtual void FileSelected(const base::FilePath& path, - int index, - void* params) override { + void FileSelected(const base::FilePath& path, + int index, + void* params) override { selected_ = true; file_index_ = index; } @@ -68,7 +68,7 @@ class SelfDeletingClient : public ui::SelectFileDialog::Listener { dialog_ = SelectFileDialogExtensionTest::CreateDialog(this); } - virtual ~SelfDeletingClient() { + ~SelfDeletingClient() override { if (dialog_.get()) dialog_->ListenerDestroyed(); } @@ -76,9 +76,9 @@ class SelfDeletingClient : public ui::SelectFileDialog::Listener { SelectFileDialogExtension* dialog() const { return dialog_.get(); } // ui::SelectFileDialog::Listener implementation - virtual void FileSelected(const base::FilePath& path, - int index, - void* params) override { + void FileSelected(const base::FilePath& path, + int index, + void* params) override { delete this; } diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc index 8443bdc..9be153a 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc @@ -1440,7 +1440,7 @@ class DetachToBrowserInSeparateDisplayTabDragControllerTest DetachToBrowserInSeparateDisplayTabDragControllerTest() {} virtual ~DetachToBrowserInSeparateDisplayTabDragControllerTest() {} - virtual void SetUpCommandLine(base::CommandLine* command_line) override { + void SetUpCommandLine(base::CommandLine* command_line) override { DetachToBrowserTabDragControllerTest::SetUpCommandLine(command_line); // Make screens sufficiently wide to host 2 browsers side by side. command_line->AppendSwitchASCII("ash-host-window-bounds", @@ -1818,7 +1818,7 @@ class DifferentDeviceScaleFactorDisplayTabDragControllerTest DifferentDeviceScaleFactorDisplayTabDragControllerTest() {} virtual ~DifferentDeviceScaleFactorDisplayTabDragControllerTest() {} - virtual void SetUpCommandLine(base::CommandLine* command_line) override { + void SetUpCommandLine(base::CommandLine* command_line) override { DetachToBrowserTabDragControllerTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII("ash-host-window-bounds", "400x400,0+400-800x800*2"); @@ -1918,7 +1918,7 @@ class DetachToBrowserInSeparateDisplayAndCancelTabDragControllerTest public: DetachToBrowserInSeparateDisplayAndCancelTabDragControllerTest() {} - virtual void SetUpCommandLine(base::CommandLine* command_line) override { + void SetUpCommandLine(base::CommandLine* command_line) override { TabDragControllerTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII("ash-host-window-bounds", "0+0-250x250,251+0-250x250"); |