Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Unified Diff: chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
diff --git a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
index 8e9a3cf7472f741bc1a58d6892bb9b75a1b22a22..9d2d3ae65c5011ee4e0fc8c85cfc3d7ee9f03736 100644
--- a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
+++ b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
@@ -34,13 +34,13 @@ class WebDialogWebContentsDelegateViews
virtual ~WebDialogWebContentsDelegateViews() {}
// ui::WebDialogWebContentsDelegate:
- virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE {
+ virtual void WebContentsFocused(content::WebContents* contents) override {
// Ensure the WebView is focused when its WebContents is focused.
web_view_->RequestFocus();
}
virtual void HandleKeyboardEvent(
content::WebContents* source,
- const content::NativeWebKeyboardEvent& event) OVERRIDE {
+ const content::NativeWebKeyboardEvent& event) override {
// Forward shortcut keys in dialog to the browser. http://crbug.com/104586
// Disabled on Mac due to http://crbug.com/112173
#if !defined(OS_MACOSX)
@@ -72,20 +72,20 @@ class ConstrainedWebDialogDelegateViews
virtual ~ConstrainedWebDialogDelegateViews() {}
// ui::WebDialogWebContentsDelegate:
- virtual void CloseContents(content::WebContents* source) OVERRIDE {
+ virtual void CloseContents(content::WebContents* source) override {
view_->GetWidget()->Close();
}
// contents::WebContentsDelegate:
virtual void HandleKeyboardEvent(
content::WebContents* source,
- const content::NativeWebKeyboardEvent& event) OVERRIDE {
+ const content::NativeWebKeyboardEvent& event) override {
unhandled_keyboard_event_handler_.HandleKeyboardEvent(
event, view_->GetFocusManager());
}
// ConstrainedWebDialogDelegate:
- virtual web_modal::NativeWebContentsModalDialog GetNativeDialog() OVERRIDE {
+ virtual web_modal::NativeWebContentsModalDialog GetNativeDialog() override {
return view_->GetWidget()->GetNativeView();
}
@@ -116,72 +116,72 @@ class ConstrainedWebDialogDelegateViewViews
virtual ~ConstrainedWebDialogDelegateViewViews() {}
// ConstrainedWebDialogDelegate:
- virtual const ui::WebDialogDelegate* GetWebDialogDelegate() const OVERRIDE {
+ virtual const ui::WebDialogDelegate* GetWebDialogDelegate() const override {
return impl_->GetWebDialogDelegate();
}
- virtual ui::WebDialogDelegate* GetWebDialogDelegate() OVERRIDE {
+ virtual ui::WebDialogDelegate* GetWebDialogDelegate() override {
return impl_->GetWebDialogDelegate();
}
- virtual void OnDialogCloseFromWebUI() OVERRIDE {
+ virtual void OnDialogCloseFromWebUI() override {
return impl_->OnDialogCloseFromWebUI();
}
- virtual void ReleaseWebContentsOnDialogClose() OVERRIDE {
+ virtual void ReleaseWebContentsOnDialogClose() override {
return impl_->ReleaseWebContentsOnDialogClose();
}
- virtual web_modal::NativeWebContentsModalDialog GetNativeDialog() OVERRIDE {
+ virtual web_modal::NativeWebContentsModalDialog GetNativeDialog() override {
return impl_->GetNativeDialog();
}
- virtual content::WebContents* GetWebContents() OVERRIDE {
+ virtual content::WebContents* GetWebContents() override {
return impl_->GetWebContents();
}
// views::WidgetDelegate:
- virtual views::View* GetInitiallyFocusedView() OVERRIDE {
+ virtual views::View* GetInitiallyFocusedView() override {
return this;
}
- virtual void WindowClosing() OVERRIDE {
+ virtual void WindowClosing() override {
if (!impl_->closed_via_webui())
GetWebDialogDelegate()->OnDialogClosed(std::string());
}
- virtual views::Widget* GetWidget() OVERRIDE {
+ virtual views::Widget* GetWidget() override {
return View::GetWidget();
}
- virtual const views::Widget* GetWidget() const OVERRIDE {
+ virtual const views::Widget* GetWidget() const override {
return View::GetWidget();
}
- virtual base::string16 GetWindowTitle() const OVERRIDE {
+ virtual base::string16 GetWindowTitle() const override {
return impl_->closed_via_webui() ? base::string16() :
GetWebDialogDelegate()->GetDialogTitle();
}
- virtual views::View* GetContentsView() OVERRIDE {
+ virtual views::View* GetContentsView() override {
return this;
}
virtual views::NonClientFrameView* CreateNonClientFrameView(
- views::Widget* widget) OVERRIDE {
+ views::Widget* widget) override {
return views::DialogDelegate::CreateDialogFrameView(widget);
}
- virtual bool ShouldShowCloseButton() const OVERRIDE {
+ virtual bool ShouldShowCloseButton() const override {
// No close button if the dialog doesn't want a title bar.
return impl_->GetWebDialogDelegate()->ShouldShowDialogTitle();
}
- virtual ui::ModalType GetModalType() const OVERRIDE {
+ virtual ui::ModalType GetModalType() const override {
return ui::MODAL_TYPE_CHILD;
}
// views::WebView:
- virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE {
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override {
// Pressing ESC closes the dialog.
DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
GetWidget()->Close();
return true;
}
- virtual gfx::Size GetPreferredSize() const OVERRIDE {
+ virtual gfx::Size GetPreferredSize() const override {
gfx::Size size;
if (!impl_->closed_via_webui())
GetWebDialogDelegate()->GetDialogSize(&size);
return size;
}
- virtual gfx::Size GetMinimumSize() const OVERRIDE {
+ virtual gfx::Size GetMinimumSize() const override {
// Return an empty size so that we can be made smaller.
return gfx::Size();
}
« no previous file with comments | « chrome/browser/ui/views/conflicting_module_view_win.h ('k') | chrome/browser/ui/views/constrained_window_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698