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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
 
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(FRAME_AVATAR_BUTTON)
 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
 #endif
 
-#if defined(ENABLE_SUPERVISED_USERS)
-class SupervisedUserAvatarLabel;
-#endif
 class AvatarMenuButton;
 class BrowserFrame;
 class BrowserView;
 
 // A specialization of the NonClientFrameView object that provides additional
 // Browser-specific methods.
 class BrowserNonClientFrameView : public views::NonClientFrameView,
                                   public ProfileInfoCacheObserver {
  public:
   BrowserNonClientFrameView(BrowserFrame* frame, BrowserView* browser_view);
   ~BrowserNonClientFrameView() override;
 
   AvatarMenuButton* avatar_button() const { return avatar_button_; }
 
 #if defined(FRAME_AVATAR_BUTTON)
   NewAvatarButton* new_avatar_button() const { return new_avatar_button_; }
 #endif
 
-#if defined(ENABLE_SUPERVISED_USERS)
-  SupervisedUserAvatarLabel* supervised_user_avatar_label() const {
-    return supervised_user_avatar_label_;
-  }
-
-  void OnThemeChanged() override;
-#endif
-
   // Called when BrowserView creates all it's child views.
   virtual void OnBrowserViewInitViewsComplete();
 
   // Retrieves the bounds, in non-client view coordinates within which the
   // TabStrip should be laid out.
   virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const = 0;
 
   // Returns the inset of the topmost view in the client view from the top of
   // the non-client view. The topmost view depends on the window type. The
   // topmost view is the tab strip for tabbed browser windows, the toolbar for
@@ skipping 64 matching lines @@
 
   // Draws a taskbar icon if avatars are enabled, erases it otherwise.
   void UpdateTaskbarDecoration();
 
   // The frame that hosts this view.
   BrowserFrame* frame_;
 
   // The BrowserView hosted within this View.
   BrowserView* browser_view_;
 
-#if defined(ENABLE_SUPERVISED_USERS)
-  SupervisedUserAvatarLabel* supervised_user_avatar_label_;
-#endif
-
 #if defined(FRAME_AVATAR_BUTTON)
   // 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.
   NewAvatarButton* new_avatar_button_;
 #endif
 
   // Menu button that displays the incognito icon. May be null for some frame
   // styles. TODO(anthonyvd): simplify/rename.
   AvatarMenuButton* avatar_button_;
 };
 
 namespace chrome {
 
 // Provided by a browser_non_client_frame_view_factory_*.cc implementation
 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
     BrowserFrame* frame, BrowserView* browser_view);
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_