Simplify some old avatar menu button code.

chrome/chrome_browser_ui.gypi

 # Copyright 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.
 
 {
   'variables': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 2260 matching lines @@
       'browser/ui/views/frame/native_browser_frame.h',
       'browser/ui/views/frame/native_browser_frame_factory.cc',
       'browser/ui/views/frame/native_browser_frame_factory.h',
       'browser/ui/views/frame/native_browser_frame_factory_chromeos.cc',
       'browser/ui/views/frame/system_menu_insertion_delegate_win.cc',
       'browser/ui/views/frame/system_menu_insertion_delegate_win.h',
       'browser/ui/views/frame/system_menu_model_builder.cc',
       'browser/ui/views/frame/system_menu_model_builder.h',
       'browser/ui/views/frame/system_menu_model_delegate.cc',
       'browser/ui/views/frame/system_menu_model_delegate.h',
-      'browser/ui/views/frame/taskbar_decorator.cc',
-      'browser/ui/views/frame/taskbar_decorator.h',
       'browser/ui/views/frame/taskbar_decorator_win.cc',
+      'browser/ui/views/frame/taskbar_decorator_win.h',
       'browser/ui/views/frame/top_container_view.cc',
       'browser/ui/views/frame/top_container_view.h',
       'browser/ui/views/frame/web_contents_close_handler.cc',
       'browser/ui/views/frame/web_contents_close_handler.h',
       'browser/ui/views/frame/web_contents_close_handler_delegate.h',
       'browser/ui/views/global_error_bubble_view.cc',
       'browser/ui/views/global_error_bubble_view.h',
       'browser/ui/views/hung_renderer_view.cc',
       'browser/ui/views/hung_renderer_view.h',
       'browser/ui/views/ime/ime_warning_bubble_view.cc',
@@ skipping 70 matching lines @@
       'browser/ui/views/passwords/credentials_item_view.h',
       'browser/ui/views/passwords/credentials_selection_view.cc',
       'browser/ui/views/passwords/credentials_selection_view.h',
       'browser/ui/views/passwords/manage_password_items_view.cc',
       'browser/ui/views/passwords/manage_password_items_view.h',
       'browser/ui/views/passwords/manage_passwords_bubble_view.cc',
       'browser/ui/views/passwords/manage_passwords_bubble_view.h',
       'browser/ui/views/passwords/manage_passwords_icon_views.cc',
       'browser/ui/views/passwords/manage_passwords_icon_views.h',
       'browser/ui/views/process_singleton_dialog_linux.cc',
-      'browser/ui/views/profiles/avatar_menu_button.cc',
-      'browser/ui/views/profiles/avatar_menu_button.h',
       'browser/ui/views/profiles/profile_chooser_view.cc',
       'browser/ui/views/profiles/profile_chooser_view.h',
+      'browser/ui/views/profiles/profile_indicator_icon.cc',
+      'browser/ui/views/profiles/profile_indicator_icon.h',
       'browser/ui/views/profiles/signin_view_controller_delegate_views.cc',
       'browser/ui/views/profiles/signin_view_controller_delegate_views.h',
       'browser/ui/views/profiles/user_manager_view.cc',
       'browser/ui/views/profiles/user_manager_view.h',
       'browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc',
       'browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.h',
       'browser/ui/views/sad_tab_view.cc',
       'browser/ui/views/sad_tab_view.h',
       'browser/ui/views/session_crashed_bubble_view.cc',
       'browser/ui/views/session_crashed_bubble_view.h',
@@ skipping 923 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }