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

Side by Side Diff: apps/ui/views/app_window_frame_view.h

Issue 641963002: Replace OVERRIDE and FINAL with override and final in src/apps (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 unified diff | Download patch
« no previous file with comments | « apps/saved_files_service_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef APPS_UI_VIEWS_APP_WINDOW_FRAME_VIEW_H_ 5 #ifndef APPS_UI_VIEWS_APP_WINDOW_FRAME_VIEW_H_
6 #define APPS_UI_VIEWS_APP_WINDOW_FRAME_VIEW_H_ 6 #define APPS_UI_VIEWS_APP_WINDOW_FRAME_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "third_party/skia/include/core/SkColor.h" 10 #include "third_party/skia/include/core/SkColor.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 void SetResizeSizes(int resize_inside_bounds_size, 62 void SetResizeSizes(int resize_inside_bounds_size,
63 int resize_outside_bounds_size, 63 int resize_outside_bounds_size,
64 int resize_area_corner_size); 64 int resize_area_corner_size);
65 int resize_inside_bounds_size() const { 65 int resize_inside_bounds_size() const {
66 return resize_inside_bounds_size_; 66 return resize_inside_bounds_size_;
67 }; 67 };
68 68
69 private: 69 private:
70 // views::NonClientFrameView implementation. 70 // views::NonClientFrameView implementation.
71 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 71 virtual gfx::Rect GetBoundsForClientView() const override;
72 virtual gfx::Rect GetWindowBoundsForClientBounds( 72 virtual gfx::Rect GetWindowBoundsForClientBounds(
73 const gfx::Rect& client_bounds) const OVERRIDE; 73 const gfx::Rect& client_bounds) const override;
74 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 74 virtual int NonClientHitTest(const gfx::Point& point) override;
75 virtual void GetWindowMask(const gfx::Size& size, 75 virtual void GetWindowMask(const gfx::Size& size,
76 gfx::Path* window_mask) OVERRIDE; 76 gfx::Path* window_mask) override;
77 virtual void ResetWindowControls() OVERRIDE {} 77 virtual void ResetWindowControls() override {}
78 virtual void UpdateWindowIcon() OVERRIDE {} 78 virtual void UpdateWindowIcon() override {}
79 virtual void UpdateWindowTitle() OVERRIDE {} 79 virtual void UpdateWindowTitle() override {}
80 virtual void SizeConstraintsChanged() OVERRIDE; 80 virtual void SizeConstraintsChanged() override;
81 81
82 // views::View implementation. 82 // views::View implementation.
83 virtual gfx::Size GetPreferredSize() const OVERRIDE; 83 virtual gfx::Size GetPreferredSize() const override;
84 virtual void Layout() OVERRIDE; 84 virtual void Layout() override;
85 virtual const char* GetClassName() const OVERRIDE; 85 virtual const char* GetClassName() const override;
86 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 86 virtual void OnPaint(gfx::Canvas* canvas) override;
87 virtual gfx::Size GetMinimumSize() const OVERRIDE; 87 virtual gfx::Size GetMinimumSize() const override;
88 virtual gfx::Size GetMaximumSize() const OVERRIDE; 88 virtual gfx::Size GetMaximumSize() const override;
89 89
90 // views::ButtonListener implementation. 90 // views::ButtonListener implementation.
91 virtual void ButtonPressed(views::Button* sender, 91 virtual void ButtonPressed(views::Button* sender,
92 const ui::Event& event) OVERRIDE; 92 const ui::Event& event) override;
93 93
94 // Some button images we use depend on the color of the frame. This 94 // Some button images we use depend on the color of the frame. This
95 // will set these images based on the color of the frame. 95 // will set these images based on the color of the frame.
96 void SetButtonImagesForFrame(); 96 void SetButtonImagesForFrame();
97 97
98 // Return the current frame color based on the active state of the window. 98 // Return the current frame color based on the active state of the window.
99 SkColor CurrentFrameColor(); 99 SkColor CurrentFrameColor();
100 100
101 views::Widget* widget_; 101 views::Widget* widget_;
102 extensions::NativeAppWindow* window_; 102 extensions::NativeAppWindow* window_;
(...skipping 13 matching lines...) Expand all
116 116
117 // Size in pixels of the lower-right corner resize handle. 117 // Size in pixels of the lower-right corner resize handle.
118 int resize_area_corner_size_; 118 int resize_area_corner_size_;
119 119
120 DISALLOW_COPY_AND_ASSIGN(AppWindowFrameView); 120 DISALLOW_COPY_AND_ASSIGN(AppWindowFrameView);
121 }; 121 };
122 122
123 } // namespace apps 123 } // namespace apps
124 124
125 #endif // APPS_UI_VIEWS_APP_WINDOW_FRAME_VIEW_H_ 125 #endif // APPS_UI_VIEWS_APP_WINDOW_FRAME_VIEW_H_
OLDNEW
« 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