Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / frame / opaque_browser_frame_view_layout.h

diff --git a/src/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h b/src/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
index 16ca682..17d13b6 100644 (file)
--- a/src/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
+++ b/src/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
@@ -9,11 +9,14 @@
 #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)
+class SupervisedUserAvatarLabel;
+#endif
+
 namespace views {
 class ImageButton;
 class Label;
@@ -27,7 +30,7 @@ class OpaqueBrowserFrameViewLayout : public views::LayoutManager {
  public:
   explicit OpaqueBrowserFrameViewLayout(
       OpaqueBrowserFrameViewLayoutDelegate* delegate);
-  virtual ~OpaqueBrowserFrameViewLayout();
+  ~OpaqueBrowserFrameViewLayout() override;
 
   // Whether we should add the (minimize,maximize,close) buttons. This should be
   // true if the buttons could be shown at any time in this session (see
@@ -139,10 +142,10 @@ class OpaqueBrowserFrameViewLayout : public views::LayoutManager {
   void SetView(int id, views::View* view);
 
   // Overriden from views::LayoutManager:
-  virtual void Layout(views::View* host) OVERRIDE;
-  virtual gfx::Size GetPreferredSize(const views::View* host) const OVERRIDE;
-  virtual void ViewAdded(views::View* host, views::View* view) OVERRIDE;
-  virtual void ViewRemoved(views::View* host, views::View* view) OVERRIDE;
+  void Layout(views::View* host) override;
+  gfx::Size GetPreferredSize(const views::View* host) const override;
+  void ViewAdded(views::View* host, views::View* view) override;
+  void ViewRemoved(views::View* host, views::View* view) override;
 
   OpaqueBrowserFrameViewLayoutDelegate* delegate_;
 
@@ -185,7 +188,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_;