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

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

Issue 355233002: Fix build when ENABLE_MANAGED_USERS is not defined (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include missing browsertest .js file in chrome_tests.gypi 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"
11 11
12 class AvatarLabel;
13 class AvatarMenuButton; 12 class AvatarMenuButton;
14 class NewAvatarButton; 13 class NewAvatarButton;
15 class OpaqueBrowserFrameViewLayoutDelegate; 14 class OpaqueBrowserFrameViewLayoutDelegate;
16 15
16 #if defined(ENABLE_MANAGED_USERS)
17 class SupervisedUserAvatarLabel;
18 #endif
19
17 namespace views { 20 namespace views {
18 class ImageButton; 21 class ImageButton;
19 class Label; 22 class Label;
20 } 23 }
21 24
22 // Calculates the position of the widgets in the opaque browser frame view. 25 // Calculates the position of the widgets in the opaque browser frame view.
23 // 26 //
24 // This is separated out for testing reasons. OpaqueBrowserFrameView has tight 27 // This is separated out for testing reasons. OpaqueBrowserFrameView has tight
25 // dependencies with Browser and classes that depend on Browser. 28 // dependencies with Browser and classes that depend on Browser.
26 class OpaqueBrowserFrameViewLayout : public views::LayoutManager { 29 class OpaqueBrowserFrameViewLayout : public views::LayoutManager {
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 181
179 // Window controls. 182 // Window controls.
180 views::ImageButton* minimize_button_; 183 views::ImageButton* minimize_button_;
181 views::ImageButton* maximize_button_; 184 views::ImageButton* maximize_button_;
182 views::ImageButton* restore_button_; 185 views::ImageButton* restore_button_;
183 views::ImageButton* close_button_; 186 views::ImageButton* close_button_;
184 187
185 views::View* window_icon_; 188 views::View* window_icon_;
186 views::Label* window_title_; 189 views::Label* window_title_;
187 190
188 AvatarLabel* avatar_label_; 191 #if defined(ENABLE_MANAGED_USERS)
192 SupervisedUserAvatarLabel* supervised_user_avatar_label_;
193 #endif
189 AvatarMenuButton* avatar_button_; 194 AvatarMenuButton* avatar_button_;
190 views::View* new_avatar_button_; 195 views::View* new_avatar_button_;
191 196
192 std::vector<views::FrameButton> leading_buttons_; 197 std::vector<views::FrameButton> leading_buttons_;
193 std::vector<views::FrameButton> trailing_buttons_; 198 std::vector<views::FrameButton> trailing_buttons_;
194 199
195 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayout); 200 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayout);
196 }; 201 };
197 202
198 #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