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

Unified Diff: apps/ui/views/app_window_frame_view.h

Issue 818113002: Standardize usage of virtual/override/final specifiers in apps/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 | « apps/saved_files_service_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/ui/views/app_window_frame_view.h
diff --git a/apps/ui/views/app_window_frame_view.h b/apps/ui/views/app_window_frame_view.h
index 6537f80851eb450bc745810f201095633f990c37..6800a12854a5b7b1a9a66eb2adcfd7100d3cbe8c 100644
--- a/apps/ui/views/app_window_frame_view.h
+++ b/apps/ui/views/app_window_frame_view.h
@@ -55,7 +55,7 @@ class AppWindowFrameView : public views::NonClientFrameView,
bool draw_frame,
const SkColor& active_frame_color,
const SkColor& inactive_frame_color);
- virtual ~AppWindowFrameView();
+ ~AppWindowFrameView() override;
void Init();
@@ -68,28 +68,26 @@ class AppWindowFrameView : public views::NonClientFrameView,
private:
// views::NonClientFrameView implementation.
- virtual gfx::Rect GetBoundsForClientView() const override;
- virtual gfx::Rect GetWindowBoundsForClientBounds(
+ gfx::Rect GetBoundsForClientView() const override;
+ gfx::Rect GetWindowBoundsForClientBounds(
const gfx::Rect& client_bounds) const override;
- virtual int NonClientHitTest(const gfx::Point& point) override;
- virtual void GetWindowMask(const gfx::Size& size,
- gfx::Path* window_mask) override;
- virtual void ResetWindowControls() override {}
- virtual void UpdateWindowIcon() override {}
- virtual void UpdateWindowTitle() override {}
- virtual void SizeConstraintsChanged() override;
+ int NonClientHitTest(const gfx::Point& point) override;
+ void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
+ void ResetWindowControls() override {}
+ void UpdateWindowIcon() override {}
+ void UpdateWindowTitle() override {}
+ void SizeConstraintsChanged() override;
// views::View implementation.
- virtual gfx::Size GetPreferredSize() const override;
- virtual void Layout() override;
- virtual const char* GetClassName() const override;
- virtual void OnPaint(gfx::Canvas* canvas) override;
- virtual gfx::Size GetMinimumSize() const override;
- virtual gfx::Size GetMaximumSize() const override;
+ gfx::Size GetPreferredSize() const override;
+ void Layout() override;
+ const char* GetClassName() const override;
+ void OnPaint(gfx::Canvas* canvas) override;
+ gfx::Size GetMinimumSize() const override;
+ gfx::Size GetMaximumSize() const override;
// views::ButtonListener implementation.
- virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) override;
+ void ButtonPressed(views::Button* sender, const ui::Event& event) override;
// Some button images we use depend on the color of the frame. This
// will set these images based on the color of the frame.
« no previous file with comments | « apps/saved_files_service_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698