[SiteChip] Draw site chip icon and site title. Drag support.

chrome/browser/ui/views/toolbar/toolbar_view.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/toolbar/toolbar_view.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/number_formatting.h"
 #include "base/prefs/pref_service.h"
@@ skipping 226 matching lines @@
   LoadImages();
 
   // Add any necessary badges to the menu item based on the system state.
   // Do this after |app_menu_| has been added as a bubble may be shown that
   // needs the widget (widget found by way of app_menu_->GetWidget()).
   UpdateAppMenuState();
 
   location_bar_->Init();
 
   site_chip_view_->Init();
+  if (site_chip_view_->ShouldShow())
+    location_bar_->set_site_chip_view(site_chip_view_);
+
   show_home_button_.Init(prefs::kShowHomeButton,
                          browser_->profile()->GetPrefs(),
                          base::Bind(&ToolbarView::OnShowHomeButtonChanged,
                                     base::Unretained(this)));
 
   browser_actions_->Init();
 
   // Accessibility specific tooltip text.
   if (content::BrowserAccessibilityState::GetInstance()->
           IsAccessibleBrowser()) {
@@ skipping 233 matching lines @@
   if (is_display_mode_normal()) {
     int button_spacing = GetButtonSpacing();
     size.Enlarge(
         kLeftEdgeSpacing + back_->GetPreferredSize().width() + button_spacing +
             forward_->GetPreferredSize().width() + button_spacing +
             reload_->GetPreferredSize().width() + kStandardSpacing +
             (show_home_button_.GetValue() ?
                 (home_->GetPreferredSize().width() + button_spacing) : 0) +
             (site_chip_view_->ShouldShow() ?
                 (site_chip_view_->GetPreferredSize().width() +
-                    2 * kStandardSpacing + 2 * button_spacing) :
+                    2 * kStandardSpacing) :
                 0) +
             browser_actions_->GetPreferredSize().width() +
             app_menu_->GetPreferredSize().width() + kRightEdgeSpacing,
         0);
     gfx::ImageSkia* normal_background =
         GetThemeProvider()->GetImageSkiaNamed(IDR_CONTENT_TOP_CENTER);
     size.SetToMax(
         gfx::Size(0, normal_background->height() - content_shadow_height()));
   } else {
     const int kPopupBottomSpacingGlass = 1;
@@ skipping 52 matching lines @@
     home_->SetVisible(true);
     home_->SetBounds(reload_->x() + reload_->width() + button_spacing,
                      child_y, home_->GetPreferredSize().width(), child_height);
   } else {
     home_->SetVisible(false);
     home_->SetBounds(reload_->x() + reload_->width(), child_y, 0, child_height);
   }
 
   int browser_actions_width = browser_actions_->GetPreferredSize().width();
 
-  // Note: spacing from location bar to site chip is 1 pixel less than
-  // kStandardSpacing given the edge thickness of the chip.
-  int site_chip_width =
-      (site_chip_view_->ShouldShow() ?
-          site_chip_view_->GetPreferredSize().width() +
-          kStandardSpacing : 0);
   int app_menu_width = app_menu_->GetPreferredSize().width();
   int location_x = home_->x() + home_->width() + kStandardSpacing;
   int available_width = std::max(0, width() - kRightEdgeSpacing -
       app_menu_width - browser_actions_width - location_x);
 
   // Cap site chip width at 1/2 the size available to the location bar.
-  site_chip_width = std::min(site_chip_width, available_width / 2);
-  available_width -= site_chip_width;
+  site_chip_view_->SetVisible(site_chip_view_->ShouldShow());
+  int site_chip_width = site_chip_view_->GetPreferredSize().width();
+  site_chip_width = std::max(0, std::min(site_chip_width,
+      (available_width - kStandardSpacing) / 2));
+  if (site_chip_view_->visible())
+    available_width -= site_chip_width;
 
   int location_height = location_bar_->GetPreferredSize().height();
   int location_y = (height() - location_height + 1) / 2;
   location_bar_->SetBounds(location_x, location_y, std::max(available_width, 0),
                            location_height);
+  int browser_actions_x = location_bar_->bounds().right();
 
-  int browser_actions_x = location_bar_->x() + location_bar_->width();
-
-  site_chip_view_->SetVisible(site_chip_view_->ShouldShow());
-  if (site_chip_view_->ShouldShow()) {
+  if (site_chip_view_->visible()) {
     site_chip_view_->SetBounds(browser_actions_x + kStandardSpacing,
                                child_y,
-                               site_chip_view_->GetPreferredSize().width(),
+                               site_chip_width,
                                child_height);
-    browser_actions_x +=
-        site_chip_view_->GetPreferredSize().width() + kStandardSpacing;
+    browser_actions_x = site_chip_view_->bounds().right();
   }
 
   browser_actions_->SetBounds(browser_actions_x, 0,
                               browser_actions_width, height());
 
   // The browser actions need to do a layout explicitly, because when an
   // extension is loaded/unloaded/changed, BrowserActionContainer removes and
   // re-adds everything, regardless of whether it has a page action. For a
   // page action, browser action bounds do not change, as a result of which
   // SetBounds does not do a layout at all.
@@ skipping 227 matching lines @@
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
       kContentShadowHeightAsh : kContentShadowHeight;
 }