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

Unified Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view.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, 3 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
« no previous file with comments | « chrome/browser/ui/view_ids.h ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_non_client_frame_view.h
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view.h
index 3167a17da8218289061be83274c00c6202a8d1be..016fda0a603a30e04f6eb669c8527de510001d0f 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.h
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.h
@@ -8,7 +8,9 @@
#include "chrome/browser/ui/views/profiles/new_avatar_button.h"
#include "ui/views/window/non_client_view.h"
-class AvatarLabel;
+#if defined(ENABLE_MANAGED_USERS)
+class SupervisedUserAvatarLabel;
+#endif
class AvatarMenuButton;
class BrowserFrame;
class BrowserView;
@@ -25,7 +27,13 @@ class BrowserNonClientFrameView : public views::NonClientFrameView {
NewAvatarButton* new_avatar_button() const { return new_avatar_button_; }
- AvatarLabel* avatar_label() const { return avatar_label_; }
+#if defined(ENABLE_MANAGED_USERS)
+ SupervisedUserAvatarLabel* supervised_user_avatar_label() const {
+ return supervised_user_avatar_label_;
+ }
+
+ virtual void OnThemeChanged() OVERRIDE;
+#endif
// Retrieves the bounds, in non-client view coordinates within which the
// TabStrip should be laid out.
@@ -46,7 +54,6 @@ class BrowserNonClientFrameView : public views::NonClientFrameView {
// Overriden from views::View.
virtual void VisibilityChanged(views::View* starting_from,
bool is_visible) OVERRIDE;
- virtual void OnThemeChanged() OVERRIDE;
protected:
BrowserView* browser_view() const { return browser_view_; }
@@ -72,8 +79,9 @@ class BrowserNonClientFrameView : public views::NonClientFrameView {
// icon. May be NULL for some frame styles.
AvatarMenuButton* avatar_button_;
- // Avatar label that is used for a supervised user.
- AvatarLabel* avatar_label_;
+#if defined(ENABLE_MANAGED_USERS)
+ SupervisedUserAvatarLabel* supervised_user_avatar_label_;
+#endif
// Menu button that displays the name of the active or guest profile.
// May be NULL and will not be displayed for off the record profiles.
« no previous file with comments | « chrome/browser/ui/view_ids.h ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698