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

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

Issue 1972033002: Simplify some old avatar menu button code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reinstate ash browser test fix Created 4 years, 7 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 "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" 9 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
10 #include "ui/views/layout/layout_manager.h" 10 #include "ui/views/layout/layout_manager.h"
11 #include "ui/views/window/frame_buttons.h" 11 #include "ui/views/window/frame_buttons.h"
12 12
13 class AvatarMenuButton;
14 class NewAvatarButton; 13 class NewAvatarButton;
15 class OpaqueBrowserFrameViewLayoutDelegate; 14 class OpaqueBrowserFrameViewLayoutDelegate;
16 15
17 namespace views { 16 namespace views {
18 class ImageButton; 17 class ImageButton;
19 class Label; 18 class Label;
20 } 19 }
21 20
22 // Calculates the position of the widgets in the opaque browser frame view. 21 // Calculates the position of the widgets in the opaque browser frame view.
23 // 22 //
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 187
189 // Window controls. 188 // Window controls.
190 views::ImageButton* minimize_button_; 189 views::ImageButton* minimize_button_;
191 views::ImageButton* maximize_button_; 190 views::ImageButton* maximize_button_;
192 views::ImageButton* restore_button_; 191 views::ImageButton* restore_button_;
193 views::ImageButton* close_button_; 192 views::ImageButton* close_button_;
194 193
195 views::View* window_icon_; 194 views::View* window_icon_;
196 views::Label* window_title_; 195 views::Label* window_title_;
197 196
198 AvatarMenuButton* avatar_button_; 197 views::View* incognito_icon_;
199 views::View* new_avatar_button_; 198 views::View* new_avatar_button_;
200 199
201 std::vector<views::FrameButton> leading_buttons_; 200 std::vector<views::FrameButton> leading_buttons_;
202 std::vector<views::FrameButton> trailing_buttons_; 201 std::vector<views::FrameButton> trailing_buttons_;
203 202
204 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayout); 203 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayout);
205 }; 204 };
206 205
207 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_ 206 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698