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

Unified Diff: athena/activity/activity_frame_view.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase 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 | « no previous file | athena/activity/activity_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/activity/activity_frame_view.h
diff --git a/athena/activity/activity_frame_view.h b/athena/activity/activity_frame_view.h
index 23f559c800894489b42e9896c0d38ad77a54b09d..f4a59fbf13deabe0ea80299318d52e9628b20e46 100644
--- a/athena/activity/activity_frame_view.h
+++ b/athena/activity/activity_frame_view.h
@@ -27,32 +27,31 @@ class ActivityFrameView : public views::NonClientFrameView,
static const char kViewClassName[];
ActivityFrameView(views::Widget* frame, ActivityViewModel* view_model);
- virtual ~ActivityFrameView();
+ ~ActivityFrameView() override;
// views::NonClientFrameView:
- 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:
- virtual gfx::Size GetPreferredSize() const override;
- virtual const char* GetClassName() const override;
- virtual void Layout() override;
- virtual void OnPaintBackground(gfx::Canvas* canvas) override;
+ gfx::Size GetPreferredSize() const override;
+ const char* GetClassName() const override;
+ void Layout() override;
+ void OnPaintBackground(gfx::Canvas* canvas) override;
private:
// WindowManagerObserver:
- virtual void OnOverviewModeEnter() override;
- virtual void OnOverviewModeExit() override;
- virtual void OnSplitViewModeEnter() override;
- virtual void OnSplitViewModeExit() override;
+ void OnOverviewModeEnter() override;
+ void OnOverviewModeExit() override;
+ void OnSplitViewModeEnter() override;
+ void OnSplitViewModeExit() override;
gfx::Insets NonClientBorderInsets() const;
int NonClientBorderThickness() const;
« no previous file with comments | « no previous file | athena/activity/activity_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698