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

Unified 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: Nits, minor refactoring Created 6 years, 5 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
Index: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
index 16ca682106d5e3c63594e678cea27ae6beaa90e5..09d773f4b1caeb3f941ba433c909c2041dbcb8b5 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
@@ -9,10 +9,12 @@
#include "ui/views/layout/layout_manager.h"
#include "ui/views/window/frame_buttons.h"
-class AvatarLabel;
class AvatarMenuButton;
class NewAvatarButton;
class OpaqueBrowserFrameViewLayoutDelegate;
+#if defined(ENABLE_MANAGED_USERS)
Bernhard Bauer 2014/07/14 16:39:05 Nit: empty line before the #ifdef block?
mckev 2014/07/14 23:50:03 Done.
+class SupervisedUserAvatarLabel;
+#endif
namespace views {
class ImageButton;
@@ -185,7 +187,9 @@ class OpaqueBrowserFrameViewLayout : public views::LayoutManager {
views::View* window_icon_;
views::Label* window_title_;
- AvatarLabel* avatar_label_;
+#if defined(ENABLE_MANAGED_USERS)
+ SupervisedUserAvatarLabel* supervised_user_avatar_label_;
+#endif
AvatarMenuButton* avatar_button_;
views::View* new_avatar_button_;

Powered by Google App Engine
This is Rietveld 408576698