Redesign of the avatar menu button.

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index afd8977f5509050f88ab43b1dbd59b284c50f330..317dd9e6dcf67ee1a3ab0aa2b1580cf5b766dd21 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -12,6 +12,7 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/views/avatar_label.h"
 #include "chrome/browser/ui/views/avatar_menu_button.h"
@@ -19,6 +20,7 @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.h"
+#include "chrome/browser/ui/views/new_avatar_button.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
@@ -150,7 +152,13 @@ OpaqueBrowserFrameView::OpaqueBrowserFrameView(BrowserFrame* frame,
   window_title_->set_id(VIEW_ID_WINDOW_TITLE);
   AddChildView(window_title_);
 
-  UpdateAvatarInfo();
+  bool is_incognito = browser_view->IsOffTheRecord() &&

[sky, 2013/09/26 20:21:39]

You seem to have this check in a couple of places, and it isn't really
incognito. Is there some better term to use here? And can a method be used for
this rather than same code here, 434 and other files?

[noms (inactive), 2013/10/01 17:42:21]

Done.

+      !browser_view->IsGuestSession();
+  if (!is_incognito && profiles::IsNewProfileManagementEnabled())
+    UpdateNewStyleAvatarInfo();
+  else
+    UpdateAvatarInfo();
+
   if (!browser_view->IsOffTheRecord()) {
     registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
                    content::NotificationService::AllSources());
@@ -423,9 +431,14 @@ void OpaqueBrowserFrameView::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
+  bool is_incognito = browser_view()->IsOffTheRecord() &&
+          !browser_view()->IsGuestSession();
   switch (type) {
     case chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED:
-      UpdateAvatarInfo();
+      if (!is_incognito && profiles::IsNewProfileManagementEnabled())
+        UpdateNewStyleAvatarInfo();
+      else
+        UpdateAvatarInfo();
       break;
     default:
       NOTREACHED() << "Got a notification we didn't register for!";
@@ -475,6 +488,14 @@ bool OpaqueBrowserFrameView::ShouldShowAvatar() const {
   return browser_view()->ShouldShowAvatar();
 }
 
+bool OpaqueBrowserFrameView::IsOffTheRecord() const {
+  return browser_view()->IsOffTheRecord();
+}
+
+bool OpaqueBrowserFrameView::IsGuestSession() const {
+  return browser_view()->IsGuestSession();
+}
+
 gfx::ImageSkia OpaqueBrowserFrameView::GetOTRAvatarIcon() const {
   return browser_view()->GetOTRAvatarIcon();
 }