Redesign of the avatar menu button.

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

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/avatar_label.h"
 #include "chrome/browser/ui/views/avatar_menu_button.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/taskbar_decorator.h"
+#include "chrome/browser/ui/views/new_avatar_button.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/background.h"
 
 BrowserNonClientFrameView::BrowserNonClientFrameView(BrowserFrame* frame,
                                                      BrowserView* browser_view)
     : frame_(frame),
       browser_view_(browser_view),
       avatar_button_(NULL),
-      avatar_label_(NULL) {
+      avatar_label_(NULL),
+      new_avatar_button_(NULL) {
 }
 
 BrowserNonClientFrameView::~BrowserNonClientFrameView() {
 }
 
 void BrowserNonClientFrameView::VisibilityChanged(views::View* starting_from,
                                                   bool is_visible) {
   if (!is_visible)
     return;
   // The first time UpdateAvatarInfo() is called the window is not visible so
   // DrawTaskBarDecoration() has no effect. Therefore we need to call it again
   // once the window is visible.
-  UpdateAvatarInfo();
+  bool is_incognito = browser_view_->IsOffTheRecord() &&
+      !browser_view_->IsGuestSession();
+  if (!is_incognito && profiles::IsNewProfileManagementEnabled())
+    UpdateNewStyleAvatarInfo();

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

Why do we need this here and not at init time?

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

I don't fully understand the comment about DrawTaskBasDecoration, but I've
changed it to have the same functionality as before -- only get called if the
old avatar icon should be displayed. 

On 2013/09/26 20:21:39, sky wrote:

+  else
+    UpdateAvatarInfo();
 }
 
 void BrowserNonClientFrameView::OnThemeChanged() {
   if (avatar_label_)
     avatar_label_->UpdateLabelStyle();
 }
 
 void BrowserNonClientFrameView::UpdateAvatarInfo() {
   if (browser_view_->ShouldShowAvatar()) {
     if (!avatar_button_) {
@@ skipping 49 matching lines @@
     if (!text.empty())
       avatar_button_->SetText(text);
   }
 
   // For popups and panels which don't have the avatar button, we still
   // need to draw the taskbar decoration.
   chrome::DrawTaskbarDecoration(
       frame_->GetNativeWindow(),
       AvatarMenu::ShouldShowAvatarMenu() ? &avatar : NULL);
 }
+
+void BrowserNonClientFrameView::UpdateNewStyleAvatarInfo() {
+  DCHECK(profiles::IsNewProfileManagementEnabled());
+  // This should never be called in incognito mode.
+  if (browser_view_->IsOffTheRecord())
+    DCHECK(browser_view_->IsGuestSession());
+
+  if (browser_view_->ShouldShowAvatar()) {
+    if (!new_avatar_button_) {
+      // The name of the profile that should be displayed in the button.
+      string16 profile_name;
+      if (browser_view_->IsGuestSession()) {
+        profile_name = l10n_util::GetStringUTF16(IDS_GUEST_PROFILE_NAME);
+      } else {
+        ProfileInfoCache& cache =
+            g_browser_process->profile_manager()->GetProfileInfoCache();
+        Profile* profile = browser_view_->browser()->profile();
+        size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
+        if (index != std::string::npos)
+          profile_name = cache.GetNameOfProfileAtIndex(index);
+      }
+      new_avatar_button_ = new NewAvatarButton(browser_view_, profile_name);
+      new_avatar_button_->set_id(VIEW_ID_NEW_AVATAR_BUTTON);
+      AddChildView(new_avatar_button_);
+      frame_->GetRootView()->Layout();
+    }
+  } else if (new_avatar_button_) {
+    RemoveChildView(new_avatar_button_);
+    delete new_avatar_button_;
+    new_avatar_button_ = NULL;
+    frame_->GetRootView()->Layout();
+  }
+}
+