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"
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/immersive_fullscreen_configuration.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_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/ash_resources.h"
 #include "grit/generated_resources.h"  // Accessibility names
 #include "grit/theme_resources.h"
@@ skipping 103 matching lines @@
   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 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) {
   if (window_icon_)
@@ skipping 261 matching lines @@
 
   if (frame()->IsFullscreen()) {
     ImmersiveModeController* immersive_controller =
         browser_view()->immersive_mode_controller();
     // Hide the incognito icon when the top-of-window views are closed in
     // immersive mode as the tab indicators are too short for the incognito
     // icon to still be recongizable.
     if (immersive_controller->IsEnabled() &&
         !immersive_controller->IsRevealed()) {
       avatar_button()->SetBoundsRect(gfx::Rect());
-      if (avatar_label())
-        avatar_label()->SetBoundsRect(gfx::Rect());
       return;
     }
   }
 
   int avatar_bottom = GetTabStripInsets(false).top +
       browser_view()->GetTabStripHeight() - kAvatarBottomSpacing;
   int avatar_restored_y = avatar_bottom - incognito_icon.height();
   int avatar_y = (frame()->IsMaximized() || frame()->IsFullscreen()) ?
       NonClientTopBorderHeight(false) + kContentShadowHeight :
       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,
-        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();
 }
 
 void BrowserNonClientFrameViewAsh::PaintToolbarBackground(gfx::Canvas* canvas) {
   gfx::Rect toolbar_bounds(browser_view()->GetToolbarBounds());
@@ skipping 100 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;
 }