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

Unified Diff: ash/shell/lock_view.cc

Issue 679283002: Standardize usage of virtual/override/final specifiers. (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: ash/shell/lock_view.cc
diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc
index 6125f407be5411d9f4390f5e0bc075fa93708204..ba5200fd48dd232ea1e3a4161d7f22824e24bda0 100644
--- a/ash/shell/lock_view.cc
+++ b/ash/shell/lock_view.cc
@@ -32,16 +32,14 @@ class LockView : public views::WidgetDelegateView,
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 @@ class LockView : public views::WidgetDelegateView,
(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 @@ class LockView : public views::WidgetDelegateView,
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();
}

Powered by Google App Engine
This is Rietveld 408576698