Redesign of the avatar menu button.

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

 // Copyright 2013 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/opaque_browser_frame_view_layout.h"
 
+#include "chrome/browser/profiles/profiles_state.h"
+#include "chrome/browser/ui/views/new_avatar_button.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 
 #if defined(OS_WIN)
 #include "win8/util/win8_util.h"
 #endif  // OS_WIN
 
 namespace {
 
@@ skipping 25 matching lines @@
 // way the tabstrip draws its bottom edge, will appear like a 1 px gap to the
 // user).
 const int kAvatarBottomSpacing = 2;
 
 // Space between the frame border and the left edge of the avatar.
 const int kAvatarLeftSpacing = 2;
 
 // Space between the right edge of the avatar and the tabstrip.
 const int kAvatarRightSpacing = -4;
 
+// How far the new avatar button is from the left of the minimize button.

[Elliot Glaysher, 2013/10/01 18:12:56]

Change comment: how far it is from the closest caption button

[noms (inactive), 2013/10/03 19:30:14]

Done.

+const int kNewAvatarButtonOffset = 5;
+
 // In restored mode, the New Tab button isn't at the same height as the caption
 // buttons, but the space will look cluttered if it actually slides under them,
 // so we stop it when the gap between the two is down to 5 px.
 const int kNewTabCaptionRestoredSpacing = 5;
 
 // In maximized mode, where the New Tab button and the caption buttons are at
 // similar vertical coordinates, we need to reserve a larger, 16 px gap to avoid
 // looking too cluttered.
 const int kNewTabCaptionMaximizedSpacing = 16;
 
@@ skipping 32 matching lines @@
       has_trailing_buttons_(false),
       extra_caption_y_(kExtraCaption),
       window_caption_spacing_(kCaptionButtonSpacing),
       minimize_button_(NULL),
       maximize_button_(NULL),
       restore_button_(NULL),
       close_button_(NULL),
       window_icon_(NULL),
       window_title_(NULL),
       avatar_label_(NULL),
-      avatar_button_(NULL) {
+      avatar_button_(NULL),
+      new_avatar_button_(NULL) {
   trailing_buttons_.push_back(views::FRAME_BUTTON_MINIMIZE);
   trailing_buttons_.push_back(views::FRAME_BUTTON_MAXIMIZE);
   trailing_buttons_.push_back(views::FRAME_BUTTON_CLOSE);
 }
 
 OpaqueBrowserFrameViewLayout::~OpaqueBrowserFrameViewLayout() {}
 
 // static
 bool OpaqueBrowserFrameViewLayout::ShouldAddDefaultCaptionButtons() {
 #if defined(OS_WIN)
@@ skipping 233 matching lines @@
       window_icon_bounds_ = gfx::Rect();
     } else {
       // We set the icon bounds to a small rectangle in the top leading corner
       // if there are no icons on the leading side.
       window_icon_bounds_ = gfx::Rect(
           frame_thickness + kIconLeftSpacing, frame_thickness, size, size);
     }
   }
 }
 
+void OpaqueBrowserFrameViewLayout::LayoutNewStyleAvatar(views::View* host) {
+  if (!has_trailing_buttons_ && !has_leading_buttons_)
+    return;
+
+  gfx::Size label_size = new_avatar_button_->GetPreferredSize();
+  int button_size_with_offset = kNewAvatarButtonOffset + label_size.width();
+
+  int button_x;
+  int button_y = CaptionButtonY(false);
+  if (has_trailing_buttons_) {
+    button_x = host->width() - trailing_button_start_ - button_size_with_offset;
+    trailing_button_start_ += button_size_with_offset;
+    minimum_size_for_buttons_ += button_size_with_offset;
+  } else {
+    button_x = leading_button_start_ + kNewAvatarButtonOffset;
+    leading_button_start_ += button_size_with_offset;
+    minimum_size_for_buttons_ += button_size_with_offset;
+  }
+
+  new_avatar_button_->set_avatar_bubble_align_right(has_trailing_buttons_);
+  new_avatar_button_->SetBounds(
+      button_x,
+      button_y,
+      label_size.width(),
+      button_y + kCaptionButtonHeightWithPadding);
+}
+
 void OpaqueBrowserFrameViewLayout::LayoutAvatar() {
   // Even though the avatar is used for both incognito and profiles we always
   // use the incognito icon to layout the avatar button. The profile icon
   // can be customized so we can't depend on its size to perform layout.
   gfx::ImageSkia incognito_icon = delegate_->GetOTRAvatarIcon();
 
   int avatar_bottom = GetTabStripInsetsTop(false) +
       delegate_->GetTabStripHeight() - kAvatarBottomSpacing;
   int avatar_restored_y = avatar_bottom - incognito_icon.height();
   int avatar_y = delegate_->IsMaximized() ?
@@ skipping 185 matching lines @@
                   view->GetClassName());
       }
       window_title_ = static_cast<views::Label*>(view);
       break;
     case VIEW_ID_AVATAR_LABEL:
       avatar_label_ = view;
       break;
     case VIEW_ID_AVATAR_BUTTON:
       avatar_button_ = view;
       break;
+    case VIEW_ID_NEW_AVATAR_BUTTON:
+      new_avatar_button_ = static_cast<NewAvatarButton*>(view);
+      break;
     default:
       NOTIMPLEMENTED() << "Unknown view id " << id;
       break;
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, views::LayoutManager:
 
 void OpaqueBrowserFrameViewLayout::Layout(views::View* host) {
   // Reset all our data so that everything is invisible.
   int thickness = FrameBorderThickness(false);
   leading_button_start_ = thickness;
   trailing_button_start_ = thickness;
   minimum_size_for_buttons_ = leading_button_start_ + trailing_button_start_;
   has_leading_buttons_ = false;
   has_trailing_buttons_ = false;
 
   LayoutWindowControls(host);
   LayoutTitleBar(host);
 
   // We now add a single pixel to the leading spacing. We do this because the
   // avatar and tab strip start one pixel inward compared to where things start
   // on the trailing side.
   leading_button_start_++;
 
-  LayoutAvatar();
+  if (delegate_->IsRegularOrGuestSession() &&
+      profiles::IsNewProfileManagementEnabled())
+    LayoutNewStyleAvatar(host);
+  else
+    LayoutAvatar();
 
   client_view_bounds_ = CalculateClientAreaBounds(
       host->width(), host->height());
 }
 
 gfx::Size OpaqueBrowserFrameViewLayout::GetPreferredSize(views::View* host) {
   // This is never used; NonClientView::GetPreferredSize() will be called
   // instead.
   NOTREACHED();
   return gfx::Size();
 }
 
 void OpaqueBrowserFrameViewLayout::ViewAdded(views::View* host,
                                              views::View* view) {
   SetView(view->id(), view);
 }
 
 void OpaqueBrowserFrameViewLayout::ViewRemoved(views::View* host,
                                                views::View* view) {
   SetView(view->id(), NULL);
 }