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

Unified Diff: ash/shell/window_type_launcher.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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
« no previous file with comments | « ash/shell/window_type_launcher.h ('k') | ash/shell/window_watcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/window_type_launcher.cc
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc
index cbd2db34e326d5697bb3612fedf142f0acfd3565..a08c06ee4f3c798a3b9acc4fb25485d979792b05 100644
--- a/ash/shell/window_type_launcher.cc
+++ b/ash/shell/window_type_launcher.cc
@@ -73,13 +73,13 @@ class ModalWindow : public views::WidgetDelegateView,
}
// Overridden from views::View:
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+ virtual void OnPaint(gfx::Canvas* canvas) override {
canvas->FillRect(GetLocalBounds(), color_);
}
- virtual gfx::Size GetPreferredSize() const OVERRIDE {
+ virtual gfx::Size GetPreferredSize() const override {
return gfx::Size(200, 200);
}
- virtual void Layout() OVERRIDE {
+ virtual void Layout() override {
gfx::Size open_ps = open_button_->GetPreferredSize();
gfx::Rect local_bounds = GetLocalBounds();
open_button_->SetBounds(
@@ -88,22 +88,22 @@ class ModalWindow : public views::WidgetDelegateView,
}
// Overridden from views::WidgetDelegate:
- virtual views::View* GetContentsView() OVERRIDE {
+ virtual views::View* GetContentsView() override {
return this;
}
- virtual bool CanResize() const OVERRIDE {
+ virtual bool CanResize() const override {
return true;
}
- virtual base::string16 GetWindowTitle() const OVERRIDE {
+ virtual base::string16 GetWindowTitle() const override {
return base::ASCIIToUTF16("Modal Window");
}
- virtual ui::ModalType GetModalType() const OVERRIDE {
+ virtual ui::ModalType GetModalType() const override {
return modal_type_;
}
// Overridden from views::ButtonListener:
virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) OVERRIDE {
+ const ui::Event& event) override {
DCHECK(sender == open_button_);
OpenModalWindow(GetWidget()->GetNativeView(), modal_type_);
}
@@ -145,24 +145,24 @@ class NonModalTransient : public views::WidgetDelegateView {
}
// Overridden from views::View:
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+ virtual void OnPaint(gfx::Canvas* canvas) override {
canvas->FillRect(GetLocalBounds(), color_);
}
- virtual gfx::Size GetPreferredSize() const OVERRIDE {
+ virtual gfx::Size GetPreferredSize() const override {
return gfx::Size(250, 250);
}
// Overridden from views::WidgetDelegate:
- virtual views::View* GetContentsView() OVERRIDE {
+ virtual views::View* GetContentsView() override {
return this;
}
- virtual bool CanResize() const OVERRIDE {
+ virtual bool CanResize() const override {
return true;
}
- virtual base::string16 GetWindowTitle() const OVERRIDE {
+ virtual base::string16 GetWindowTitle() const override {
return base::ASCIIToUTF16("Non-Modal Transient");
}
- virtual void DeleteDelegate() OVERRIDE {
+ virtual void DeleteDelegate() override {
if (GetWidget() == non_modal_transient_)
non_modal_transient_ = NULL;
« no previous file with comments | « ash/shell/window_type_launcher.h ('k') | ash/shell/window_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698