Remove old-avatar supervised user labels on non-Mac.

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
 
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 
-#if defined(ENABLE_SUPERVISED_USERS)
-#include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h"
-#endif
-
 namespace {
 
 // Besides the frame border, there's empty space atop the window in restored
 // mode, to use to drag the window around.
 const int kNonClientRestoredExtraThickness = 11;
 
 // The titlebar never shrinks too short to show the caption button plus some
 // padding below it.
 const int kCaptionButtonHeight = 18;
 const int kTitleBarAdditionalPadding = 3;
@@ skipping 18 matching lines @@
 // way the tabstrip draws its bottom edge, will appear like a 1 px gap to the
 // user).
 const int kAvatarBottomSpacing = 2;
 
 // Space between the frame border and the edge of the avatar.
 const int kAvatarOuterSpacing = 2;
 
 // Space between the edge of the avatar and the tabstrip.
 const int kAvatarInnerSpacing = 4;
 
-#if defined(ENABLE_SUPERVISED_USERS)
-// Space between the trailing edge of the avatar label and the tabstrip.
-const int kSupervisedUserAvatarLabelInnerSpacing = 10;
-#endif
-
 // How far the new avatar button is from the closest caption button.
 const int kNewAvatarButtonOffset = 5;
 
 // When the title bar is in its normal two row mode (usually the case for
 // restored windows), the New Tab button isn't at the same height as the caption
 // buttons, but the space will look cluttered if it actually slides under them,
 // so we stop it when the gap between the two is down to 5 px.
 const int kNewTabCaptionNormalSpacing = 5;
 
 // When the title bar is condensed to one row (as when maximized), the New Tab
@@ skipping 40 matching lines @@
       has_leading_buttons_(false),
       has_trailing_buttons_(false),
       extra_caption_y_(kExtraCaption),
       window_caption_spacing_(kCaptionButtonSpacing),
       minimize_button_(nullptr),
       maximize_button_(nullptr),
       restore_button_(nullptr),
       close_button_(nullptr),
       window_icon_(nullptr),
       window_title_(nullptr),
-#if defined(ENABLE_SUPERVISED_USERS)
-      supervised_user_avatar_label_(nullptr),
-#endif
       avatar_button_(nullptr),
       new_avatar_button_(nullptr) {
   trailing_buttons_.push_back(views::FRAME_BUTTON_MINIMIZE);
   trailing_buttons_.push_back(views::FRAME_BUTTON_MAXIMIZE);
   trailing_buttons_.push_back(views::FRAME_BUTTON_CLOSE);
 }
 
 OpaqueBrowserFrameViewLayout::~OpaqueBrowserFrameViewLayout() {}
 
 void OpaqueBrowserFrameViewLayout::SetButtonOrdering(
     const std::vector<views::FrameButton>& leading_buttons,
     const std::vector<views::FrameButton>& trailing_buttons) {
   leading_buttons_ = leading_buttons;
   trailing_buttons_ = trailing_buttons;
 }
 
 gfx::Rect OpaqueBrowserFrameViewLayout::GetBoundsForTabStrip(
     const gfx::Size& tabstrip_preferred_size,
     int available_width) const {
   available_width -= trailing_button_start_;
   available_width -= leading_button_start_;
 
   const int caption_spacing = NewTabCaptionSpacing();
   const int tabstrip_width = available_width - caption_spacing;
   gfx::Rect bounds(leading_button_start_, GetTabStripInsetsTop(false),
                    std::max(0, tabstrip_width),
                    tabstrip_preferred_size.height());
 
   int leading_tabstrip_indent = kTabStripIndent;
-  if (delegate_->ShouldShowAvatar() && !ShouldAvatarBeOnRight()) {
-#if defined(ENABLE_SUPERVISED_USERS)
-    if (supervised_user_avatar_label_ &&
-        supervised_user_avatar_label_->bounds().width())
-      leading_tabstrip_indent += kSupervisedUserAvatarLabelInnerSpacing;
-    else
-      leading_tabstrip_indent += kAvatarInnerSpacing;
-#else
+  if (delegate_->ShouldShowAvatar() && !ShouldAvatarBeOnRight())
     leading_tabstrip_indent += kAvatarInnerSpacing;
-#endif
-  }
   bounds.Inset(leading_tabstrip_indent, 0, 0, 0);
   return bounds;
 }
 
 gfx::Size OpaqueBrowserFrameViewLayout::GetMinimumSize(
     int available_width) const {
   gfx::Size min_size = delegate_->GetBrowserViewMinimumSize();
   int border_thickness = NonClientBorderThickness();
   min_size.Enlarge(2 * border_thickness,
                    NonClientTopBorderHeight(false) + border_thickness);
@@ skipping 264 matching lines @@
       avatar_restored_y;
   avatar_bounds_.SetRect(
       avatar_x,
       avatar_y,
       incognito_icon.width(),
       delegate_->ShouldShowAvatar() ? (avatar_bottom - avatar_y) : 0);
   if (avatar_button_) {
     avatar_button_->set_button_on_right(avatar_on_right);
     avatar_button_->SetBoundsRect(avatar_bounds_);
 
-    int edge_offset;
-#if defined(ENABLE_SUPERVISED_USERS)
-    if (supervised_user_avatar_label_) {
-      supervised_user_avatar_label_->SetLabelOnRight(avatar_on_right);
-      // Space between the bottom of the avatar and the bottom of the avatar
-      // label.
-      const int kSupervisedUserAvatarLabelBottomSpacing = 3;
-      gfx::Size label_size = supervised_user_avatar_label_->GetPreferredSize();
-      // The outside edge of the avatar label should be just outside that of the
-      // avatar menu button.
-      int avatar_label_x = avatar_on_right ?
-          (host->width() - trailing_button_start_ - label_size.width()) :
-          leading_button_start_;
-      gfx::Rect label_bounds(
-          avatar_label_x,
-          avatar_bottom - kSupervisedUserAvatarLabelBottomSpacing -
-            label_size.height(),
-          label_size.width(),
-          delegate_->ShouldShowAvatar() ? label_size.height() : 0);
-      supervised_user_avatar_label_->SetBoundsRect(label_bounds);
-      edge_offset = label_size.width();
-    } else {
-      edge_offset = kAvatarOuterSpacing + incognito_icon.width();
-    }
-#else
-    edge_offset = kAvatarOuterSpacing + incognito_icon.width();
-#endif
+    int edge_offset = kAvatarOuterSpacing + incognito_icon.width();
     if (avatar_on_right)
       trailing_button_start_ += edge_offset;
     else
       leading_button_start_ += edge_offset;
 
     // We just add the avatar button size to the minimum size because clicking
     // the avatar label does the same thing as clicking the avatar button.
     minimum_size_for_buttons_ += kAvatarOuterSpacing + incognito_icon.width();
   }
 }
@@ skipping 157 matching lines @@
     case VIEW_ID_WINDOW_ICON:
       window_icon_ = view;
       break;
     case VIEW_ID_WINDOW_TITLE:
       if (view) {
         DCHECK_EQ(std::string(views::Label::kViewClassName),
                   view->GetClassName());
       }
       window_title_ = static_cast<views::Label*>(view);
       break;
-#if defined(ENABLE_SUPERVISED_USERS)
-    case VIEW_ID_SUPERVISED_USER_AVATAR_LABEL:
-      supervised_user_avatar_label_ =
-          static_cast<SupervisedUserAvatarLabel*>(view);
-      break;
-#endif
     case VIEW_ID_AVATAR_BUTTON:
       if (view) {
         DCHECK_EQ(std::string(AvatarMenuButton::kViewClassName),
                   view->GetClassName());
       }
       avatar_button_ = static_cast<AvatarMenuButton*>(view);
       break;
     case VIEW_ID_NEW_AVATAR_BUTTON:
       new_avatar_button_ = view;
       break;
@@ skipping 42 matching lines @@
 
 void OpaqueBrowserFrameViewLayout::ViewAdded(views::View* host,
                                              views::View* view) {
   SetView(view->id(), view);
 }
 
 void OpaqueBrowserFrameViewLayout::ViewRemoved(views::View* host,
                                                views::View* view) {
   SetView(view->id(), nullptr);
 }