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/app_list.cc b/ash/shell/app_list.cc
index b1bd7dbf..7b35902 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -138,9 +138,7 @@
}
// AppListItem
- virtual void Activate(int event_flags) override {
- ActivateItem(type_, event_flags);
- }
+ void Activate(int event_flags) override { ActivateItem(type_, event_flags); }
private:
Type type_;
@@ -189,7 +187,7 @@
WindowTypeShelfItem::Type type() const { return type_; }
// app_list::SearchResult:
- virtual scoped_ptr<SearchResult> Duplicate() override {
+ scoped_ptr<SearchResult> Duplicate() override {
return scoped_ptr<SearchResult>();
}
@@ -240,56 +238,45 @@
}
// Overridden from app_list::AppListViewDelegate:
- virtual bool ForceNativeDesktop() const override {
- return false;
- }
+ bool ForceNativeDesktop() const override { return false; }
- virtual void SetProfileByPath(const base::FilePath& profile_path) override {
+ void SetProfileByPath(const base::FilePath& profile_path) override {
// Nothing needs to be done.
}
- virtual const Users& GetUsers() const override {
- return users_;
- }
+ const Users& GetUsers() const override { return users_; }
- virtual bool ShouldCenterWindow() const override {
- return false;
- }
+ bool ShouldCenterWindow() const override { return false; }
- virtual app_list::AppListModel* GetModel() override { return model_.get(); }
+ app_list::AppListModel* GetModel() override { return model_.get(); }
- virtual app_list::SpeechUIModel* GetSpeechUI() override {
- return &speech_ui_;
- }
+ app_list::SpeechUIModel* GetSpeechUI() override { return &speech_ui_; }
- virtual void GetShortcutPathForApp(
+ void GetShortcutPathForApp(
const std::string& app_id,
const base::Callback<void(const base::FilePath&)>& callback) override {
callback.Run(base::FilePath());
}
- virtual void OpenSearchResult(app_list::SearchResult* result,
- bool auto_launch,
- int event_flags) override {
+ void OpenSearchResult(app_list::SearchResult* result,
+ bool auto_launch,
+ int event_flags) override {
const ExampleSearchResult* example_result =
static_cast<const ExampleSearchResult*>(result);
WindowTypeShelfItem::ActivateItem(example_result->type(), event_flags);
}
- virtual void InvokeSearchResultAction(app_list::SearchResult* result,
- int action_index,
- int event_flags) override {
+ void InvokeSearchResultAction(app_list::SearchResult* result,
+ int action_index,
+ int event_flags) override {
NOTIMPLEMENTED();
}
- virtual base::TimeDelta GetAutoLaunchTimeout() override {
- return base::TimeDelta();
- }
+ base::TimeDelta GetAutoLaunchTimeout() override { return base::TimeDelta(); }
- virtual void AutoLaunchCanceled() override {
- }
+ void AutoLaunchCanceled() override {}
- virtual void StartSearch() override {
+ void StartSearch() override {
base::string16 query;
base::TrimWhitespace(model_->search_box()->text(), base::TRIM_ALL, &query);
query = base::i18n::ToLower(query);
@@ -311,60 +298,53 @@
}
}
- virtual void StopSearch() override {
+ void StopSearch() override {
// Nothing needs to be done.
}
- virtual void ViewInitialized() override {
+ void ViewInitialized() override {
// Nothing needs to be done.
}
- virtual void Dismiss() override {
+ void Dismiss() override {
DCHECK(ash::Shell::HasInstance());
Shell::GetInstance()->DismissAppList();
}
- virtual void ViewClosing() override {
+ void ViewClosing() override {
// Nothing needs to be done.
}
- virtual gfx::ImageSkia GetWindowIcon() override {
- return gfx::ImageSkia();
- }
+ gfx::ImageSkia GetWindowIcon() override { return gfx::ImageSkia(); }
- virtual void OpenSettings() override {
+ void OpenSettings() override {
// Nothing needs to be done.
}
- virtual void OpenHelp() override {
+ void OpenHelp() override {
// Nothing needs to be done.
}
- virtual void OpenFeedback() override {
+ void OpenFeedback() override {
// Nothing needs to be done.
}
- virtual void ToggleSpeechRecognition() override {
- NOTIMPLEMENTED();
- }
+ void ToggleSpeechRecognition() override { NOTIMPLEMENTED(); }
- virtual void ShowForProfileByPath(
- const base::FilePath& profile_path) override {
+ void ShowForProfileByPath(const base::FilePath& profile_path) override {
// Nothing needs to be done.
}
- virtual views::View* CreateStartPageWebView(const gfx::Size& size) override {
+ views::View* CreateStartPageWebView(const gfx::Size& size) override {
return NULL;
}
- virtual std::vector<views::View*> CreateCustomPageWebViews(
+ std::vector<views::View*> CreateCustomPageWebViews(
const gfx::Size& size) override {
return std::vector<views::View*>();
}
- virtual bool IsSpeechRecognitionEnabled() override {
- return false;
- }
+ bool IsSpeechRecognitionEnabled() override { return false; }
scoped_ptr<app_list::AppListModel> model_;
app_list::SpeechUIModel speech_ui_;
diff --git a/ash/shell/bubble.cc b/ash/shell/bubble.cc
index 00e80e6..5c157ee 100644
--- a/ash/shell/bubble.cc
+++ b/ash/shell/bubble.cc
@@ -24,7 +24,7 @@
: BubbleDelegateView(config.anchor_view, config.arrow),
label_(config.label) {}
- virtual void Init() override {
+ void Init() override {
SetLayoutManager(new views::FillLayout());
views::Label* label = new views::Label(label_);
AddChildView(label);
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc
index c41c030..e0d55c2d 100644
--- a/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/ash/shell/content_client/shell_browser_main_parts.cc
@@ -51,14 +51,14 @@
class ShellViewsDelegate : public views::TestViewsDelegate {
public:
ShellViewsDelegate() {}
- virtual ~ShellViewsDelegate() {}
+ ~ShellViewsDelegate() override {}
// Overridden from views::TestViewsDelegate:
- virtual views::NonClientFrameView* CreateDefaultNonClientFrameView(
+ views::NonClientFrameView* CreateDefaultNonClientFrameView(
views::Widget* widget) override {
return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget);
}
- virtual void OnBeforeWidgetInit(
+ void OnBeforeWidgetInit(
views::Widget::InitParams* params,
views::internal::NativeWidgetDelegate* delegate) override {
if (params->opacity == views::Widget::InitParams::INFER_OPACITY)
diff --git a/ash/shell/content_client/shell_browser_main_parts.h b/ash/shell/content_client/shell_browser_main_parts.h
index 757c818f..8968431 100644
--- a/ash/shell/content_client/shell_browser_main_parts.h
+++ b/ash/shell/content_client/shell_browser_main_parts.h
@@ -36,15 +36,15 @@
public:
explicit ShellBrowserMainParts(
const content::MainFunctionParams& parameters);
- virtual ~ShellBrowserMainParts();
+ ~ShellBrowserMainParts() override;
// Overridden from content::BrowserMainParts:
- virtual void PreMainMessageLoopStart() override;
- virtual void PostMainMessageLoopStart() override;
- virtual void ToolkitInitialized() override;
- virtual void PreMainMessageLoopRun() override;
- virtual bool MainMessageLoopRun(int* result_code) override;
- virtual void PostMainMessageLoopRun() override;
+ void PreMainMessageLoopStart() override;
+ void PostMainMessageLoopStart() override;
+ void ToolkitInitialized() override;
+ void PreMainMessageLoopRun() override;
+ bool MainMessageLoopRun(int* result_code) override;
+ void PostMainMessageLoopRun() override;
content::ShellBrowserContext* browser_context() {
return browser_context_.get();
diff --git a/ash/shell/content_client/shell_content_browser_client.h b/ash/shell/content_client/shell_content_browser_client.h
index 324b6ae7..1a5eb44 100644
--- a/ash/shell/content_client/shell_content_browser_client.h
+++ b/ash/shell/content_client/shell_content_browser_client.h
@@ -24,12 +24,12 @@
class ShellContentBrowserClient : public content::ContentBrowserClient {
public:
ShellContentBrowserClient();
- virtual ~ShellContentBrowserClient();
+ ~ShellContentBrowserClient() override;
// Overridden from content::ContentBrowserClient:
- virtual content::BrowserMainParts* CreateBrowserMainParts(
+ content::BrowserMainParts* CreateBrowserMainParts(
const content::MainFunctionParams& parameters) override;
- virtual net::URLRequestContextGetter* CreateRequestContext(
+ net::URLRequestContextGetter* CreateRequestContext(
content::BrowserContext* browser_context,
content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector request_interceptors) override;
diff --git a/ash/shell/content_client/shell_main_delegate.h b/ash/shell/content_client/shell_main_delegate.h
index b506a1bf..7daf1fa 100644
--- a/ash/shell/content_client/shell_main_delegate.h
+++ b/ash/shell/content_client/shell_main_delegate.h
@@ -24,11 +24,11 @@
class ShellMainDelegate : public content::ContentMainDelegate {
public:
ShellMainDelegate();
- virtual ~ShellMainDelegate();
+ ~ShellMainDelegate() override;
- virtual bool BasicStartupComplete(int* exit_code) override;
- virtual void PreSandboxStartup() override;
- virtual content::ContentBrowserClient* CreateContentBrowserClient() override;
+ bool BasicStartupComplete(int* exit_code) override;
+ void PreSandboxStartup() override;
+ content::ContentBrowserClient* CreateContentBrowserClient() override;
private:
void InitializeResourceBundle();
diff --git a/ash/shell/context_menu.h b/ash/shell/context_menu.h
index 53dc75d9..7126298 100644
--- a/ash/shell/context_menu.h
+++ b/ash/shell/context_menu.h
@@ -22,15 +22,14 @@
public ui::SimpleMenuModel::Delegate {
public:
explicit ContextMenu(aura::Window* root);
- virtual ~ContextMenu();
+ ~ContextMenu() override;
// ui::SimpleMenuModel::Delegate overrides:
- virtual bool IsCommandIdChecked(int command_id) const override;
- virtual bool IsCommandIdEnabled(int command_id) const override;
- virtual bool GetAcceleratorForCommandId(
- int command_id,
- ui::Accelerator* accelerator) override;
- virtual void ExecuteCommand(int command_id, int event_flags) override;
+ bool IsCommandIdChecked(int command_id) const override;
+ bool IsCommandIdEnabled(int command_id) const override;
+ bool GetAcceleratorForCommandId(int command_id,
+ ui::Accelerator* accelerator) override;
+ void ExecuteCommand(int command_id, int event_flags) override;
private:
enum MenuItem {
diff --git a/ash/shell/keyboard_controller_proxy_stub.h b/ash/shell/keyboard_controller_proxy_stub.h
index aedfd41..2444b27 100644
--- a/ash/shell/keyboard_controller_proxy_stub.h
+++ b/ash/shell/keyboard_controller_proxy_stub.h
@@ -18,20 +18,21 @@
class KeyboardControllerProxyStub : public keyboard::KeyboardControllerProxy {
public:
KeyboardControllerProxyStub();
- virtual ~KeyboardControllerProxyStub();
+ ~KeyboardControllerProxyStub() override;
- virtual bool HasKeyboardWindow() const override;
- virtual aura::Window* GetKeyboardWindow() override;
+ bool HasKeyboardWindow() const override;
+ aura::Window* GetKeyboardWindow() override;
private:
// Overridden from keyboard::KeyboardControllerProxy:
- virtual content::BrowserContext* GetBrowserContext() override;
- virtual ui::InputMethod* GetInputMethod() override;
- virtual void RequestAudioInput(content::WebContents* web_contents,
+ content::BrowserContext* GetBrowserContext() override;
+ ui::InputMethod* GetInputMethod() override;
+ void RequestAudioInput(
+ content::WebContents* web_contents,
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback) override;
- virtual void LoadSystemKeyboard() override;
- virtual void ReloadKeyboardIfNeeded() override;
+ void LoadSystemKeyboard() override;
+ void ReloadKeyboardIfNeeded() override;
aura::test::TestWindowDelegate delegate_;
scoped_ptr<aura::Window> keyboard_;
diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc
index 6125f40..ba5200fd 100644
--- a/ash/shell/lock_view.cc
+++ b/ash/shell/lock_view.cc
@@ -32,16 +32,14 @@
AddChildView(unlock_button_);
unlock_button_->SetFocusable(true);
}
- virtual ~LockView() {}
+ ~LockView() override {}
// Overridden from views::View:
- virtual gfx::Size GetPreferredSize() const override {
- return gfx::Size(500, 400);
- }
+ gfx::Size GetPreferredSize() const override { return gfx::Size(500, 400); }
private:
// Overridden from views::View:
- virtual void OnPaint(gfx::Canvas* canvas) override {
+ void OnPaint(gfx::Canvas* canvas) override {
canvas->FillRect(GetLocalBounds(), SK_ColorYELLOW);
base::string16 text = base::ASCIIToUTF16("LOCKED!");
int string_width = gfx::GetStringWidth(text, font_list_);
@@ -50,7 +48,7 @@
(height() - font_list_.GetHeight()) / 2,
string_width, font_list_.GetHeight()));
}
- virtual void Layout() override {
+ void Layout() override {
gfx::Rect bounds = GetLocalBounds();
gfx::Size ps = unlock_button_->GetPreferredSize();
bounds.set_y(bounds.bottom() - ps.height() - 5);
@@ -58,20 +56,19 @@
bounds.set_size(ps);
unlock_button_->SetBoundsRect(bounds);
}
- virtual void ViewHierarchyChanged(
+ void ViewHierarchyChanged(
const ViewHierarchyChangedDetails& details) override {
if (details.is_add && details.child == this)
unlock_button_->RequestFocus();
}
// Overridden from views::WidgetDelegateView:
- virtual void WindowClosing() override {
+ void WindowClosing() override {
Shell::GetInstance()->session_state_delegate()->UnlockScreen();
}
// Overridden from views::ButtonListener:
- virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) override {
+ void ButtonPressed(views::Button* sender, const ui::Event& event) override {
DCHECK(sender == unlock_button_);
GetWidget()->Close();
}
diff --git a/ash/shell/panel_window.h b/ash/shell/panel_window.h
index ffa765c..f67f5d0 100644
--- a/ash/shell/panel_window.h
+++ b/ash/shell/panel_window.h
@@ -20,7 +20,7 @@
class PanelWindow : public views::WidgetDelegateView {
public:
explicit PanelWindow(const std::string& name);
- virtual ~PanelWindow();
+ ~PanelWindow() override;
// Creates the widget for the panel window using |params_|.
views::Widget* CreateWidget();
@@ -33,16 +33,16 @@
private:
// Overridden from views::View:
- virtual gfx::Size GetPreferredSize() const override;
- virtual void OnPaint(gfx::Canvas* canvas) override;
+ gfx::Size GetPreferredSize() const override;
+ void OnPaint(gfx::Canvas* canvas) override;
// Overridden from views::WidgetDelegate:
- virtual base::string16 GetWindowTitle() const override;
- virtual View* GetContentsView() override;
- virtual bool CanResize() const override;
- virtual bool CanMaximize() const override;
- virtual bool CanMinimize() const override;
- virtual views::NonClientFrameView* CreateNonClientFrameView(
+ base::string16 GetWindowTitle() const override;
+ View* GetContentsView() override;
+ bool CanResize() const override;
+ bool CanMaximize() const override;
+ bool CanMinimize() const override;
+ views::NonClientFrameView* CreateNonClientFrameView(
views::Widget* widget) override;
std::string name_;
diff --git a/ash/shell/shelf_delegate_impl.h b/ash/shell/shelf_delegate_impl.h
index f9a0640..9d7247e1 100644
--- a/ash/shell/shelf_delegate_impl.h
+++ b/ash/shell/shelf_delegate_impl.h
@@ -20,19 +20,19 @@
class ShelfDelegateImpl : public ShelfDelegate {
public:
explicit ShelfDelegateImpl(WindowWatcher* watcher);
- virtual ~ShelfDelegateImpl();
+ ~ShelfDelegateImpl() override;
void set_watcher(WindowWatcher* watcher) { watcher_ = watcher; }
// ShelfDelegate overrides:
- virtual void OnShelfCreated(Shelf* shelf) override;
- virtual void OnShelfDestroyed(Shelf* shelf) override;
- virtual ShelfID GetShelfIDForAppID(const std::string& app_id) override;
- virtual const std::string& GetAppIDForShelfID(ShelfID id) override;
- virtual void PinAppWithID(const std::string& app_id) override;
- virtual bool IsAppPinned(const std::string& app_id) override;
- virtual bool CanPin() const override;
- virtual void UnpinAppWithID(const std::string& app_id) override;
+ void OnShelfCreated(Shelf* shelf) override;
+ void OnShelfDestroyed(Shelf* shelf) override;
+ ShelfID GetShelfIDForAppID(const std::string& app_id) override;
+ const std::string& GetAppIDForShelfID(ShelfID id) override;
+ void PinAppWithID(const std::string& app_id) override;
+ bool IsAppPinned(const std::string& app_id) override;
+ bool CanPin() const override;
+ void UnpinAppWithID(const std::string& app_id) override;
private:
// Used to update Launcher. Owned by main.
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 828e01e..c9de885 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -33,22 +33,22 @@
class NewWindowDelegateImpl : public NewWindowDelegate {
public:
NewWindowDelegateImpl() {}
- virtual ~NewWindowDelegateImpl() {}
+ ~NewWindowDelegateImpl() override {}
// NewWindowDelegate:
- virtual void NewTab() override {}
- virtual void NewWindow(bool incognito) override {
+ void NewTab() override {}
+ void NewWindow(bool incognito) override {
ash::shell::ToplevelWindow::CreateParams create_params;
create_params.can_resize = true;
create_params.can_maximize = true;
ash::shell::ToplevelWindow::CreateToplevelWindow(create_params);
}
- virtual void OpenFileManager() override {}
- virtual void OpenCrosh() override {}
- virtual void RestoreTab() override {}
- virtual void ShowKeyboardOverlay() override {}
- virtual void ShowTaskManager() override {}
- virtual void OpenFeedbackPage() override {}
+ void OpenFileManager() override {}
+ void OpenCrosh() override {}
+ void RestoreTab() override {}
+ void ShowKeyboardOverlay() override {}
+ void ShowTaskManager() override {}
+ void OpenFeedbackPage() override {}
private:
DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl);
@@ -57,13 +57,13 @@
class MediaDelegateImpl : public MediaDelegate {
public:
MediaDelegateImpl() {}
- virtual ~MediaDelegateImpl() {}
+ ~MediaDelegateImpl() override {}
// MediaDelegate:
- virtual void HandleMediaNextTrack() override {}
- virtual void HandleMediaPlayPause() override {}
- virtual void HandleMediaPrevTrack() override {}
- virtual MediaCaptureState GetMediaCaptureState(
+ void HandleMediaNextTrack() override {}
+ void HandleMediaPlayPause() override {}
+ void HandleMediaPrevTrack() override {}
+ MediaCaptureState GetMediaCaptureState(
content::BrowserContext* context) override {
return MEDIA_CAPTURE_VIDEO;
}
@@ -77,64 +77,61 @@
SessionStateDelegateImpl()
: screen_locked_(false), user_info_(new user_manager::UserInfoImpl()) {}
- virtual ~SessionStateDelegateImpl() {}
+ ~SessionStateDelegateImpl() override {}
// SessionStateDelegate:
- virtual content::BrowserContext* GetBrowserContextByIndex(
+ content::BrowserContext* GetBrowserContextByIndex(
MultiProfileIndex index) override {
return Shell::GetInstance()->delegate()->GetActiveBrowserContext();
}
- virtual content::BrowserContext* GetBrowserContextForWindow(
+ content::BrowserContext* GetBrowserContextForWindow(
aura::Window* window) override {
return Shell::GetInstance()->delegate()->GetActiveBrowserContext();
}
- virtual int GetMaximumNumberOfLoggedInUsers() const override { return 3; }
- virtual int NumberOfLoggedInUsers() const override {
+ int GetMaximumNumberOfLoggedInUsers() const override { return 3; }
+ int NumberOfLoggedInUsers() const override {
// ash_shell has 2 users.
return 2;
}
- virtual bool IsActiveUserSessionStarted() const override { return true; }
- virtual bool CanLockScreen() const override { return true; }
- virtual bool IsScreenLocked() const override { return screen_locked_; }
- virtual bool ShouldLockScreenBeforeSuspending() const override {
- return false;
- }
- virtual void LockScreen() override {
+ bool IsActiveUserSessionStarted() const override { return true; }
+ bool CanLockScreen() const override { return true; }
+ bool IsScreenLocked() const override { return screen_locked_; }
+ bool ShouldLockScreenBeforeSuspending() const override { return false; }
+ void LockScreen() override {
shell::CreateLockScreen();
screen_locked_ = true;
Shell::GetInstance()->UpdateShelfVisibility();
}
- virtual void UnlockScreen() override {
+ void UnlockScreen() override {
screen_locked_ = false;
Shell::GetInstance()->UpdateShelfVisibility();
}
- virtual bool IsUserSessionBlocked() const override {
+ bool IsUserSessionBlocked() const override {
return !IsActiveUserSessionStarted() || IsScreenLocked();
}
- virtual SessionState GetSessionState() const override {
+ SessionState GetSessionState() const override {
// Assume that if session is not active we're at login.
return IsActiveUserSessionStarted() ? SESSION_STATE_ACTIVE
: SESSION_STATE_LOGIN_PRIMARY;
}
- virtual const user_manager::UserInfo* GetUserInfo(
+ const user_manager::UserInfo* GetUserInfo(
MultiProfileIndex index) const override {
return user_info_.get();
}
- virtual const user_manager::UserInfo* GetUserInfo(
+ const user_manager::UserInfo* GetUserInfo(
content::BrowserContext* context) const override {
return user_info_.get();
}
- virtual bool ShouldShowAvatar(aura::Window* window) const override {
+ bool ShouldShowAvatar(aura::Window* window) const override {
return !user_info_->GetImage().isNull();
}
- virtual void SwitchActiveUser(const std::string& user_id) override {}
- virtual void CycleActiveUser(CycleUser cycle_user) override {}
- virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const override {
+ void SwitchActiveUser(const std::string& user_id) override {}
+ void CycleActiveUser(CycleUser cycle_user) override {}
+ bool IsMultiProfileAllowedByPrimaryUserPolicy() const override {
return true;
}
- virtual void AddSessionStateObserver(
- ash::SessionStateObserver* observer) override {}
- virtual void RemoveSessionStateObserver(
+ void AddSessionStateObserver(ash::SessionStateObserver* observer) override {}
+ void RemoveSessionStateObserver(
ash::SessionStateObserver* observer) override {}
private:
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.
diff --git a/ash/shell/toplevel_window.h b/ash/shell/toplevel_window.h
index ad515ba..693bad5 100644
--- a/ash/shell/toplevel_window.h
+++ b/ash/shell/toplevel_window.h
@@ -27,24 +27,22 @@
private:
explicit ToplevelWindow(const CreateParams& params);
- virtual ~ToplevelWindow();
+ ~ToplevelWindow() override;
// Overridden from views::View:
- virtual void OnPaint(gfx::Canvas* canvas) override;
+ void OnPaint(gfx::Canvas* canvas) override;
// Overridden from views::WidgetDelegate:
- virtual base::string16 GetWindowTitle() const override;
- virtual void SaveWindowPlacement(
- const gfx::Rect& bounds,
- ui::WindowShowState show_state) override;
- virtual bool GetSavedWindowPlacement(
- const views::Widget* widget,
- gfx::Rect* bounds,
- ui::WindowShowState* show_state) const override;
- virtual View* GetContentsView() override;
- virtual bool CanResize() const override;
- virtual bool CanMaximize() const override;
- virtual bool CanMinimize() const override;
+ base::string16 GetWindowTitle() const override;
+ void SaveWindowPlacement(const gfx::Rect& bounds,
+ ui::WindowShowState show_state) override;
+ bool GetSavedWindowPlacement(const views::Widget* widget,
+ gfx::Rect* bounds,
+ ui::WindowShowState* show_state) const override;
+ View* GetContentsView() override;
+ bool CanResize() const override;
+ bool CanMaximize() const override;
+ bool CanMinimize() const override;
const CreateParams params_;
diff --git a/ash/shell/widgets.cc b/ash/shell/widgets.cc
index 43044149..3db7727 100644
--- a/ash/shell/widgets.cc
+++ b/ash/shell/widgets.cc
@@ -27,17 +27,17 @@
class WidgetsWindow : public views::WidgetDelegateView {
public:
WidgetsWindow();
- virtual ~WidgetsWindow();
+ ~WidgetsWindow() override;
// Overridden from views::View:
- virtual void OnPaint(gfx::Canvas* canvas) override;
- virtual void Layout() override;
- virtual gfx::Size GetPreferredSize() const override;
+ void OnPaint(gfx::Canvas* canvas) override;
+ void Layout() override;
+ gfx::Size GetPreferredSize() const override;
// Overridden from views::WidgetDelegate:
- virtual views::View* GetContentsView() override;
- virtual base::string16 GetWindowTitle() const override;
- virtual bool CanResize() const override;
+ views::View* GetContentsView() override;
+ base::string16 GetWindowTitle() const override;
+ bool CanResize() const override;
private:
views::LabelButton* button_;
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc
index a08c06e..74dcbdd 100644
--- a/ash/shell/window_type_launcher.cc
+++ b/ash/shell/window_type_launcher.cc
@@ -61,8 +61,7 @@
open_button_->SetStyle(views::Button::STYLE_BUTTON);
AddChildView(open_button_);
}
- virtual ~ModalWindow() {
- }
+ ~ModalWindow() override {}
static void OpenModalWindow(aura::Window* parent, ui::ModalType modal_type) {
views::Widget* widget =
@@ -73,13 +72,11 @@
}
// Overridden from views::View:
- virtual void OnPaint(gfx::Canvas* canvas) override {
+ void OnPaint(gfx::Canvas* canvas) override {
canvas->FillRect(GetLocalBounds(), color_);
}
- virtual gfx::Size GetPreferredSize() const override {
- return gfx::Size(200, 200);
- }
- virtual void Layout() override {
+ gfx::Size GetPreferredSize() const override { return gfx::Size(200, 200); }
+ void Layout() override {
gfx::Size open_ps = open_button_->GetPreferredSize();
gfx::Rect local_bounds = GetLocalBounds();
open_button_->SetBounds(
@@ -88,22 +85,15 @@
}
// Overridden from views::WidgetDelegate:
- virtual views::View* GetContentsView() override {
- return this;
- }
- virtual bool CanResize() const override {
- return true;
- }
- virtual base::string16 GetWindowTitle() const override {
+ views::View* GetContentsView() override { return this; }
+ bool CanResize() const override { return true; }
+ base::string16 GetWindowTitle() const override {
return base::ASCIIToUTF16("Modal Window");
}
- virtual ui::ModalType GetModalType() const override {
- return modal_type_;
- }
+ ui::ModalType GetModalType() const override { return modal_type_; }
// Overridden from views::ButtonListener:
- virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) override {
+ void ButtonPressed(views::Button* sender, const ui::Event& event) override {
DCHECK(sender == open_button_);
OpenModalWindow(GetWidget()->GetNativeView(), modal_type_);
}
@@ -122,8 +112,7 @@
: color_(g_colors[g_color_index]) {
++g_color_index %= arraysize(g_colors);
}
- virtual ~NonModalTransient() {
- }
+ ~NonModalTransient() override {}
static void OpenNonModalTransient(aura::Window* parent) {
views::Widget* widget =
@@ -145,24 +134,18 @@
}
// Overridden from views::View:
- virtual void OnPaint(gfx::Canvas* canvas) override {
+ void OnPaint(gfx::Canvas* canvas) override {
canvas->FillRect(GetLocalBounds(), color_);
}
- virtual gfx::Size GetPreferredSize() const override {
- return gfx::Size(250, 250);
- }
+ gfx::Size GetPreferredSize() const override { return gfx::Size(250, 250); }
// Overridden from views::WidgetDelegate:
- virtual views::View* GetContentsView() override {
- return this;
- }
- virtual bool CanResize() const override {
- return true;
- }
- virtual base::string16 GetWindowTitle() const override {
+ views::View* GetContentsView() override { return this; }
+ bool CanResize() const override { return true; }
+ base::string16 GetWindowTitle() const override {
return base::ASCIIToUTF16("Non-Modal Transient");
}
- virtual void DeleteDelegate() override {
+ void DeleteDelegate() override {
if (GetWidget() == non_modal_transient_)
non_modal_transient_ = NULL;
diff --git a/ash/shell/window_type_launcher.h b/ash/shell/window_type_launcher.h
index da6575af..d0560f0 100644
--- a/ash/shell/window_type_launcher.h
+++ b/ash/shell/window_type_launcher.h
@@ -26,7 +26,7 @@
public views::ContextMenuController {
public:
WindowTypeLauncher();
- virtual ~WindowTypeLauncher();
+ ~WindowTypeLauncher() override;
private:
typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
@@ -37,27 +37,26 @@
};
// Overridden from views::View:
- virtual void OnPaint(gfx::Canvas* canvas) override;
- virtual bool OnMousePressed(const ui::MouseEvent& event) override;
+ void OnPaint(gfx::Canvas* canvas) override;
+ bool OnMousePressed(const ui::MouseEvent& event) override;
// Overridden from views::WidgetDelegate:
- virtual views::View* GetContentsView() override;
- virtual bool CanResize() const override;
- virtual base::string16 GetWindowTitle() const override;
- virtual bool CanMaximize() const override;
- virtual bool CanMinimize() const override;
+ views::View* GetContentsView() override;
+ bool CanResize() const override;
+ base::string16 GetWindowTitle() const override;
+ bool CanMaximize() const override;
+ bool CanMinimize() const override;
// Overridden from views::ButtonListener:
- virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) override;
+ void ButtonPressed(views::Button* sender, const ui::Event& event) override;
// Overridden from views::MenuDelegate:
- virtual void ExecuteCommand(int id, int event_flags) override;
+ void ExecuteCommand(int id, int event_flags) override;
// Override from views::ContextMenuController:
- virtual void ShowContextMenuForView(views::View* source,
- const gfx::Point& point,
- ui::MenuSourceType source_type) override;
+ void ShowContextMenuForView(views::View* source,
+ const gfx::Point& point,
+ ui::MenuSourceType source_type) override;
views::LabelButton* create_button_;
views::LabelButton* create_persistant_button_;
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
index f56cf78..990cef1e 100644
--- a/ash/shell/window_watcher.cc
+++ b/ash/shell/window_watcher.cc
@@ -25,14 +25,13 @@
explicit WorkspaceWindowWatcher(WindowWatcher* watcher) : watcher_(watcher) {
}
- virtual ~WorkspaceWindowWatcher() {
- }
+ ~WorkspaceWindowWatcher() override {}
- virtual void OnWindowAdded(aura::Window* new_window) override {
+ void OnWindowAdded(aura::Window* new_window) override {
new_window->AddObserver(watcher_);
}
- virtual void OnWillRemoveWindow(aura::Window* window) override {
+ void OnWillRemoveWindow(aura::Window* window) override {
DCHECK(window->children().empty());
window->RemoveObserver(watcher_);
}
diff --git a/ash/shell/window_watcher.h b/ash/shell/window_watcher.h
index 1aa9125..001914d5 100644
--- a/ash/shell/window_watcher.h
+++ b/ash/shell/window_watcher.h
@@ -29,19 +29,19 @@
public gfx::DisplayObserver {
public:
WindowWatcher();
- virtual ~WindowWatcher();
+ ~WindowWatcher() override;
aura::Window* GetWindowByID(ash::ShelfID id);
// aura::WindowObserver overrides:
- virtual void OnWindowAdded(aura::Window* new_window) override;
- virtual void OnWillRemoveWindow(aura::Window* window) override;
+ void OnWindowAdded(aura::Window* new_window) override;
+ void OnWillRemoveWindow(aura::Window* window) override;
// gfx::DisplayObserver overrides:
- 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 metrics) override;
+ void OnDisplayAdded(const gfx::Display& new_display) override;
+ void OnDisplayRemoved(const gfx::Display& old_display) override;
+ void OnDisplayMetricsChanged(const gfx::Display& display,
+ uint32_t metrics) override;
private:
class WorkspaceWindowWatcher;
diff --git a/ash/shell/window_watcher_shelf_item_delegate.h b/ash/shell/window_watcher_shelf_item_delegate.h
index 1da99d7..117156b 100644
--- a/ash/shell/window_watcher_shelf_item_delegate.h
+++ b/ash/shell/window_watcher_shelf_item_delegate.h
@@ -19,16 +19,16 @@
class WindowWatcherShelfItemDelegate : public ShelfItemDelegate {
public:
WindowWatcherShelfItemDelegate(ShelfID id, WindowWatcher* watcher);
- virtual ~WindowWatcherShelfItemDelegate();
+ ~WindowWatcherShelfItemDelegate() override;
// ShelfItemDelegate:
- virtual bool ItemSelected(const ui::Event& event) override;
- virtual base::string16 GetTitle() override;
- virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) override;
- virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
- virtual bool IsDraggable() override;
- virtual bool ShouldShowTooltip() override;
- virtual void Close() override;
+ bool ItemSelected(const ui::Event& event) override;
+ base::string16 GetTitle() override;
+ ui::MenuModel* CreateContextMenu(aura::Window* root_window) override;
+ ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
+ bool IsDraggable() override;
+ bool ShouldShowTooltip() override;
+ void Close() override;
private:
ShelfID id_;
