Redesign of the avatar menu button.

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

Index: chrome/browser/ui/views/frame/browser_view.h
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index a7a3421a4fa097a1d5348ded934e2414fba566ee..a3768aa01ae9b02a4e9d95d974fa5cec4b3f7b2f 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -192,14 +192,18 @@ class BrowserView : public BrowserWindow,
   // incognito.
   bool IsOffTheRecord() const;
 
-  // Returns the resource ID to use for the OTR icon, which depends on
-  // which layout is being shown and whether we are full-screen.
-  int GetOTRIconResourceID() const;
-
   // Returns true if the profile associated with this Browser window is
   // a guest session.
   bool IsGuestSession() const;

[sky, 2013/10/03 23:23:11]

I believe you can nuke this once you address my other comment.

[noms (inactive), 2013/10/07 21:18:15]

It's still needed by the function that determines which avatar icon to show
(line 84). I tried pulling that code out into profiles_state.cc, where I moved
the code that determines the display name of the profile, but it would need to
include browser_view (for the OTRIconResouceID), which is not allowed from under
profiles.

On 2013/10/03 23:23:11, sky wrote:

 
+  // Returns true if the profile associated with this Browser window is
+  // not off the record or a guest session.
+  bool IsRegularOrGuestSession() const;
+
+  // Returns the resource ID to use for the OTR icon, which depends on
+  // which layout is being shown and whether we are full-screen.
+  int GetOTRIconResourceID() const;
+
   // Returns the resource ID to use for the Guest icon, which may depend on
   // which layout is being shown and whether we are full-screen.
   int GetGuestIconResourceID() const;