Create new look of the avatar label.

chrome/browser/ui/views/frame/opaque_browser_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/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 217 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, BrowserNonClientFrameView implementation:
 
 gfx::Rect OpaqueBrowserFrameView::GetBoundsForTabStrip(
     views::View* tabstrip) const {
   if (!tabstrip)
     return gfx::Rect();
 
   gfx::Rect bounds = GetBoundsForTabStripAndAvatarArea(tabstrip);
-  int space_left_of_tabstrip = browser_view()->ShouldShowAvatar() ?
-      (kAvatarLeftSpacing + avatar_bounds_.width() + kAvatarRightSpacing) :
-      kTabStripIndent;
-  if (avatar_label() && avatar_label()->bounds().width()) {
-    space_left_of_tabstrip += views::kRelatedControlHorizontalSpacing +
-                              avatar_label()->bounds().width();
+  int space_left_of_tabstrip = kTabStripIndent;
+  if (browser_view()->ShouldShowAvatar()) {
+    if (avatar_label() && avatar_label()->bounds().width()) {
+      // Space between the right edge of the avatar label and the tabstrip.
+      const int kAvatarLabelRightSpacing = -10;
+      space_left_of_tabstrip =
+          avatar_label()->bounds().right() + kAvatarLabelRightSpacing;
+    } else {
+      space_left_of_tabstrip =
+          kAvatarLeftSpacing + avatar_bounds_.width() + kAvatarRightSpacing;
+    }
   }
   bounds.Inset(space_left_of_tabstrip, 0, 0, 0);
   return bounds;
 }
 
 BrowserNonClientFrameView::TabStripInsets
 OpaqueBrowserFrameView::GetTabStripInsets(bool restored) const {
   int top = NonClientTopBorderHeight(restored) + ((!restored &&
       (!frame()->ShouldLeaveOffsetNearTopBorder() ||
       frame()->IsFullscreen())) ?
@@ skipping 769 matching lines @@
   int avatar_y = frame()->IsMaximized() ?
       (NonClientTopBorderHeight(false) + kTabstripTopShadowThickness) :
       avatar_restored_y;
   avatar_bounds_.SetRect(NonClientBorderThickness() + kAvatarLeftSpacing,
       avatar_y, incognito_icon.width(),
       browser_view()->ShouldShowAvatar() ? (avatar_bottom - avatar_y) : 0);
   if (avatar_button())
     avatar_button()->SetBoundsRect(avatar_bounds_);
 
   if (avatar_label()) {
-    gfx::Size size = avatar_label()->GetPreferredSize();
-    int label_height = std::min(avatar_bounds_.height(), size.height());
+    // Space between the bottom of the avatar and the bottom of the avatar
+    // label.
+    const int kAvatarLabelBottomSpacing = 3;
+    // Space between the frame border and the left edge of the avatar label.
+    const int kAvatarLabelLeftSpacing = -1;
+    gfx::Size label_size = avatar_label()->GetPreferredSize();
     gfx::Rect label_bounds(
-        avatar_bounds_.right() + views::kRelatedControlHorizontalSpacing,
-        avatar_y + (avatar_bounds_.height() - label_height) / 2,
-        size.width(),
-        browser_view()->ShouldShowAvatar() ? size.height() : 0);
+        FrameBorderThickness(false) + kAvatarLabelLeftSpacing,
+        avatar_bottom - kAvatarLabelBottomSpacing - label_size.height(),
+        label_size.width(),
+        browser_view()->ShouldShowAvatar() ? label_size.height() : 0);
     avatar_label()->SetBoundsRect(label_bounds);
   }
 }
 
 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,
                                                             int height) const {
   int top_height = NonClientTopBorderHeight(false);
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - GetReservedHeight() -
                        top_height - border_thickness));
 }