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

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

 // Copyright (c) 2012 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/browser_non_client_frame_view.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 12 matching lines @@
 #include "components/signin/core/common/profile_management_switches.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/image/image.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
 #include "ui/views/resources/grit/views_resources.h"
 
-#if defined(ENABLE_SUPERVISED_USERS)
-#include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h"
-#endif
-
 BrowserNonClientFrameView::BrowserNonClientFrameView(BrowserFrame* frame,
                                                      BrowserView* browser_view)
     : frame_(frame),
       browser_view_(browser_view),
-#if defined(ENABLE_SUPERVISED_USERS)
-      supervised_user_avatar_label_(nullptr),
-#endif
 #if defined(FRAME_AVATAR_BUTTON)
       new_avatar_button_(nullptr),
 #endif
       avatar_button_(nullptr) {
   // The profile manager may by null in tests.
   if (g_browser_process->profile_manager()) {
     ProfileInfoCache& cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     cache.AddObserver(this);
   }
@@ skipping 48 matching lines @@
 #if defined(FRAME_AVATAR_BUTTON)
   // Only perform a re-layout if the avatar button has changed, since that
   // can affect the size of the tabs.
   if (child == new_avatar_button_) {
     InvalidateLayout();
     frame_->GetRootView()->Layout();
   }
 #endif
 }
 
-#if defined(ENABLE_SUPERVISED_USERS)
-void BrowserNonClientFrameView::OnThemeChanged() {
-  if (supervised_user_avatar_label_)
-    supervised_user_avatar_label_->UpdateLabelStyle();
-}
-#endif
-
 bool BrowserNonClientFrameView::ShouldPaintAsThemed() const {
   return browser_view_->IsBrowserTypeNormal();
 }
 
 SkColor BrowserNonClientFrameView::GetFrameColor() const {
   ThemeProperties::OverwritableByUserThemeProperty color_id =
       ShouldPaintAsActive() ? ThemeProperties::COLOR_FRAME
                             : ThemeProperties::COLOR_FRAME_INACTIVE;
   return ShouldPaintAsThemed() ? GetThemeProvider()->GetColor(color_id)
                                : ThemeProperties::GetDefaultColor(
@@ skipping 60 matching lines @@
   if (browser_view()->IsRegularOrGuestSession())
     UpdateNewAvatarButtonImpl();
   else
 #endif
     UpdateOldAvatarButton();
 }
 
 void BrowserNonClientFrameView::UpdateOldAvatarButton() {
   if (browser_view_->ShouldShowAvatar()) {
     if (!avatar_button_) {
-#if defined(ENABLE_SUPERVISED_USERS)
-      Profile* profile = browser_view_->browser()->profile();
-      if (profile->IsSupervised() && !supervised_user_avatar_label_) {
-        supervised_user_avatar_label_ =
-            new SupervisedUserAvatarLabel(browser_view_);
-        supervised_user_avatar_label_->set_id(
-            VIEW_ID_SUPERVISED_USER_AVATAR_LABEL);
-        AddChildView(supervised_user_avatar_label_);
-      }
-#endif
       avatar_button_ = new AvatarMenuButton(browser_view_);
       avatar_button_->set_id(VIEW_ID_AVATAR_BUTTON);
       AddChildView(avatar_button_);
       // Invalidate here because adding a child does not invalidate the layout.
       InvalidateLayout();
       frame_->GetRootView()->Layout();
     }
   } else if (avatar_button_) {
-#if defined(ENABLE_SUPERVISED_USERS)
-    // The avatar label can just be there if there is also an avatar button.
-    if (supervised_user_avatar_label_) {
-      RemoveChildView(supervised_user_avatar_label_);
-      delete supervised_user_avatar_label_;
-      supervised_user_avatar_label_ = nullptr;
-    }
-#endif
     RemoveChildView(avatar_button_);
     delete avatar_button_;
     avatar_button_ = nullptr;
     frame_->GetRootView()->Layout();
   }
 
   gfx::Image avatar;
   gfx::Image taskbar_badge_avatar;
   bool is_rectangle = false;
 
@@ skipping 88 matching lines @@
       const ProfileInfoCache& cache =
           g_browser_process->profile_manager()->GetProfileInfoCache();
       show_decoration = show_decoration && cache.GetNumberOfProfiles() > 1;
     }
     chrome::DrawTaskbarDecoration(frame_->GetNativeWindow(),
         show_decoration
             ? (taskbar_badge_avatar.IsEmpty() ? &avatar : &taskbar_badge_avatar)
             : nullptr);
   }
 }