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

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

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 81344a8881e5fca1e35c343cf204aee2b06dc002..a9c5e90df17efc196aee8d9feb8be5b4e1c3c810 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
@@ -12,9 +12,6 @@
 #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;
@@ -33,14 +30,6 @@ class BrowserNonClientFrameView : public views::NonClientFrameView,
   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();
 
@@ -125,10 +114,6 @@ class BrowserNonClientFrameView : public views::NonClientFrameView,
   // 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.