Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states:
Explicitly annotate overrides of virtual functions or virtual
destructors with an override or (less frequently) final specifier.
Older (pre-C++11) code will use the virtual keyword as an inferior
alternative annotation. For clarity, use exactly one of override,
final, or virtual when declaring an override.
To better conform to these guidelines, the following constructs have
been rewritten:
- if a base class has a virtual destructor, then:
virtual ~Foo(); -> ~Foo() override;
- virtual void Foo() override; -> void Foo() override;
- virtual void Foo() override final; -> void Foo() final;
This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.
BUG=417463
[email protected]
Review URL: https://codereview.chromium.org/679283002
Cr-Commit-Position: refs/heads/master@{#301535}
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index b10ef10..502161de 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -27,43 +27,41 @@
class ShellDelegateImpl : public ash::ShellDelegate {
public:
ShellDelegateImpl();
- virtual ~ShellDelegateImpl();
+ ~ShellDelegateImpl() override;
void SetWatcher(WindowWatcher* watcher);
void set_browser_context(content::BrowserContext* browser_context) {
browser_context_ = browser_context;
}
- virtual bool IsFirstRunAfterBoot() const override;
- virtual bool IsIncognitoAllowed() const override;
- virtual bool IsMultiProfilesEnabled() const override;
- virtual bool IsRunningInForcedAppMode() const override;
- virtual bool IsMultiAccountEnabled() const override;
- virtual void PreInit() override;
- virtual void PreShutdown() override;
- virtual void Exit() override;
- virtual keyboard::KeyboardControllerProxy*
- CreateKeyboardControllerProxy() override;
- virtual void VirtualKeyboardActivated(bool activated) override;
- virtual void AddVirtualKeyboardStateObserver(
+ bool IsFirstRunAfterBoot() const override;
+ bool IsIncognitoAllowed() const override;
+ bool IsMultiProfilesEnabled() const override;
+ bool IsRunningInForcedAppMode() const override;
+ bool IsMultiAccountEnabled() const override;
+ void PreInit() override;
+ void PreShutdown() override;
+ void Exit() override;
+ keyboard::KeyboardControllerProxy* CreateKeyboardControllerProxy() override;
+ void VirtualKeyboardActivated(bool activated) override;
+ void AddVirtualKeyboardStateObserver(
VirtualKeyboardStateObserver* observer) override;
- virtual void RemoveVirtualKeyboardStateObserver(
+ void RemoveVirtualKeyboardStateObserver(
VirtualKeyboardStateObserver* observer) override;
- virtual content::BrowserContext* GetActiveBrowserContext() override;
- virtual app_list::AppListViewDelegate* GetAppListViewDelegate() override;
- virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
- virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
- virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
- virtual ash::SessionStateDelegate* CreateSessionStateDelegate() override;
- virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
- virtual ash::NewWindowDelegate* CreateNewWindowDelegate() override;
- virtual ash::MediaDelegate* CreateMediaDelegate() override;
- virtual ui::MenuModel* CreateContextMenu(
- aura::Window* root_window,
- ash::ShelfItemDelegate* item_delegate,
- ash::ShelfItem* item) override;
- virtual GPUSupport* CreateGPUSupport() override;
- virtual base::string16 GetProductName() const override;
+ content::BrowserContext* GetActiveBrowserContext() override;
+ app_list::AppListViewDelegate* GetAppListViewDelegate() override;
+ ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
+ ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
+ ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
+ ash::SessionStateDelegate* CreateSessionStateDelegate() override;
+ ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
+ ash::NewWindowDelegate* CreateNewWindowDelegate() override;
+ ash::MediaDelegate* CreateMediaDelegate() override;
+ ui::MenuModel* CreateContextMenu(aura::Window* root_window,
+ ash::ShelfItemDelegate* item_delegate,
+ ash::ShelfItem* item) override;
+ GPUSupport* CreateGPUSupport() override;
+ base::string16 GetProductName() const override;
private:
// Used to update Launcher. Owned by main.
