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

Side by Side Diff: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
7 7
8 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" 8 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
9 #include "ui/views/layout/layout_manager.h" 9 #include "ui/views/layout/layout_manager.h"
10 #include "ui/views/window/frame_buttons.h" 10 #include "ui/views/window/frame_buttons.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 // Adds a window caption button to either the leading or trailing side. 135 // Adds a window caption button to either the leading or trailing side.
136 void SetBoundsForButton(views::View* host, 136 void SetBoundsForButton(views::View* host,
137 views::ImageButton* button, 137 views::ImageButton* button,
138 ButtonAlignment align, 138 ButtonAlignment align,
139 int caption_y); 139 int caption_y);
140 140
141 // Internal implementation of ViewAdded() and ViewRemoved(). 141 // Internal implementation of ViewAdded() and ViewRemoved().
142 void SetView(int id, views::View* view); 142 void SetView(int id, views::View* view);
143 143
144 // Overriden from views::LayoutManager: 144 // Overriden from views::LayoutManager:
145 virtual void Layout(views::View* host) OVERRIDE; 145 virtual void Layout(views::View* host) override;
146 virtual gfx::Size GetPreferredSize(const views::View* host) const OVERRIDE; 146 virtual gfx::Size GetPreferredSize(const views::View* host) const override;
147 virtual void ViewAdded(views::View* host, views::View* view) OVERRIDE; 147 virtual void ViewAdded(views::View* host, views::View* view) override;
148 virtual void ViewRemoved(views::View* host, views::View* view) OVERRIDE; 148 virtual void ViewRemoved(views::View* host, views::View* view) override;
149 149
150 OpaqueBrowserFrameViewLayoutDelegate* delegate_; 150 OpaqueBrowserFrameViewLayoutDelegate* delegate_;
151 151
152 // The layout rect of the avatar icon, if visible. 152 // The layout rect of the avatar icon, if visible.
153 gfx::Rect avatar_bounds_; 153 gfx::Rect avatar_bounds_;
154 154
155 // The bounds of the ClientView. 155 // The bounds of the ClientView.
156 gfx::Rect client_view_bounds_; 156 gfx::Rect client_view_bounds_;
157 157
158 // The layout of the window icon, if visible. 158 // The layout of the window icon, if visible.
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 AvatarMenuButton* avatar_button_; 194 AvatarMenuButton* avatar_button_;
195 views::View* new_avatar_button_; 195 views::View* new_avatar_button_;
196 196
197 std::vector<views::FrameButton> leading_buttons_; 197 std::vector<views::FrameButton> leading_buttons_;
198 std::vector<views::FrameButton> trailing_buttons_; 198 std::vector<views::FrameButton> trailing_buttons_;
199 199
200 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayout); 200 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayout);
201 }; 201 };
202 202
203 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_ 203 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698