Create new look of the avatar label.

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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_ash.h"
 
 #include "ash/shell_delegate.h"
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "chrome/browser/themes/theme_properties.h"
@@ skipping 114 matching lines @@
   if (!tabstrip)
     return gfx::Rect();
   TabStripInsets insets(GetTabStripInsets(false));
   return gfx::Rect(insets.left, insets.top,
                    std::max(0, width() - insets.left - insets.right),
                    tabstrip->GetPreferredSize().height());
 }
 
 BrowserNonClientFrameView::TabStripInsets
 BrowserNonClientFrameViewAsh::GetTabStripInsets(bool force_restored) const {
-  int left = avatar_button() ? kAvatarSideSpacing +
-      browser_view()->GetOTRAvatarIcon().width() + kAvatarSideSpacing :
-      kTabstripLeftSpacing;
-  if (avatar_label()) {
-    left += avatar_label()->GetPreferredSize().width() +
-            views::kRelatedControlHorizontalSpacing;
+  int left = kTabstripLeftSpacing;
+  if (avatar_button()) {
+    if (avatar_label()) {
+      left = avatar_label()->GetPreferredSize().width() - 6;
+    } else {
+      left = kAvatarSideSpacing + browser_view()->GetOTRAvatarIcon().width() +
+             kAvatarSideSpacing;
+    }
   }
   int right = frame_painter_->GetRightInset() + kTabstripRightSpacing;
   return TabStripInsets(NonClientTopBorderHeight(force_restored), left, right);
 }
 
 int BrowserNonClientFrameViewAsh::GetThemeBackgroundXInset() const {
   return frame_painter_->GetThemeBackgroundXInset();
 }
 
 void BrowserNonClientFrameViewAsh::UpdateThrobber(bool running) {
@@ skipping 283 matching lines @@
       avatar_restored_y;
   gfx::Rect avatar_bounds(kAvatarSideSpacing,
                           avatar_y,
                           incognito_icon.width(),
                           avatar_bottom - avatar_y);
   avatar_button()->SetBoundsRect(avatar_bounds);
   if (avatar_label()) {
     gfx::Size size = avatar_label()->GetPreferredSize();
     int label_height = std::min(avatar_bounds.height(), size.height());
     gfx::Rect label_bounds(
-        avatar_bounds.right() + views::kRelatedControlHorizontalSpacing,
-        avatar_y + (avatar_bounds.height() - label_height) / 2,
+        0,
+        avatar_bottom - size.height() - 3,
         size.width(),
         size.height());
     avatar_label()->SetBoundsRect(label_bounds);
   }
 }
 
 bool BrowserNonClientFrameViewAsh::ShouldPaint() const {
   // Immersive mode windows are fullscreen, but need to paint during a reveal.
   return !frame()->IsFullscreen() ||
       browser_view()->immersive_mode_controller()->IsRevealed();
@@ skipping 104 matching lines @@
 int BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImageId() const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
       browser_view()->IsBrowserTypeNormal() &&
       !browser_view()->IsOffTheRecord()) {
     return ShouldPaintAsActive() ?
         IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE;
   }
   return 0;
 }