Simplify some old avatar menu button code.

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

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
index 7fc8ec93150c1389d1258246e725bc519d4cc60f..52dcf87c4a3c097e8cbfe34c4ba1ad9e92fd3d57 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
@@ -74,7 +74,7 @@ class BrowserNonClientFrameViewAsh : public BrowserNonClientFrameView,
 
  protected:
   // BrowserNonClientFrameView:
-  void UpdateAvatar() override;
+  void UpdateProfileIcons() override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, WindowHeader);
@@ -114,8 +114,8 @@ class BrowserNonClientFrameViewAsh : public BrowserNonClientFrameView,
   // accoutrements.
   bool UseWebAppHeaderStyle() const;
 
-  // Layout the avatar button.
-  void LayoutAvatar();
+  // Layout the image that indicates incognito or teleported windows.

[Peter Kasting, 2016/05/17 03:51:42]

Nit: Seems like we ought not to need to explain again what this is here since we
did so in BrowserNonClientFrameView.  Maybe if it's not clear we should just
explicitly tell readers to look there?

[Evan Stade, 2016/05/17 18:13:09]

removed. This is an example where "ProfileIndicator" makes it easier to
guess/figure out what this is referring to (as opposed to the more generic
"ProfileIcon").

+  void LayoutProfileIndicator();
 
   // Returns true if there is anything to paint. Some fullscreen windows do not
   // need their frames painted.