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

chrome/browser/ui/views/location_bar/location_bar_view.cc

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 911d0dfd7ff94a2a3812b9e73cf2f45770bdde9c..9ff69879fa6dab4fcca27b4a1e2261634ad74483 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -56,6 +56,7 @@
 #include "chrome/browser/ui/views/location_bar/zoom_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h"
+#include "chrome/browser/ui/views/toolbar/site_chip_view.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -183,6 +184,7 @@ LocationBarView::LocationBarView(Browser* browser,
       open_pdf_in_reader_view_(NULL),
       manage_passwords_icon_view_(NULL),
       script_bubble_icon_view_(NULL),
+      site_chip_view_(NULL),
       translate_icon_view_(NULL),
       star_view_(NULL),
       search_button_(NULL),
@@ -719,8 +721,8 @@ void LocationBarView::Layout() {
         selected_keyword_view_->set_is_extension_icon(false);
       }
     }
-  } else if (GetToolbarModel()->GetSecurityLevel(false) ==
-      ToolbarModel::EV_SECURE) {
+  } else if (!site_chip_view_ &&
+      (GetToolbarModel()->GetSecurityLevel(false) == ToolbarModel::EV_SECURE)) {
     ev_bubble_view_->SetLabel(GetToolbarModel()->GetEVCertName());
     // The largest fraction of the omnibox that can be taken by the EV bubble.
     const double kMaxBubbleFraction = 0.5;
@@ -969,11 +971,13 @@ void LocationBarView::SelectAll() {
 }
 
 views::ImageView* LocationBarView::GetLocationIconView() {
-  return location_icon_view_;
+  return site_chip_view_ ?

[msw, 2013/12/11 21:54:44]

I think this change will alter the point returned by
LocationBarView::GetLocationBarAnchorPoint, which is used to draw the infobar
arrows, I suspect that's okay, but I want to make sure it's intended and working
as expected (since it uses some view-coordinate translation that might break by
not hosting the location icon view).

Please follow up with some cleanup to make that a function of ToolbarView (or
similar) and not LocationBarView if it's no longer a point necessarily contained
by LocationBarView. Filing an Issue to followup would be appreciated.

[Greg Billock, 2013/12/11 22:34:08]

Yep. That's the intention -- infobars will be drawn pointing to the location
icon in the site chip.
Will do. I simplified this a bit earlier, making this patch clean, and moving it
up to the toolbar may be possible. I think the way things currently work the
location bar needs to know the infobar painting situation, but perhaps that's no
longer true.

+      site_chip_view_->location_icon_view() : location_icon_view_;
 }
 
 const views::ImageView* LocationBarView::GetLocationIconView() const {
-  return location_icon_view_;
+  return site_chip_view_ ?
+      site_chip_view_->location_icon_view() : location_icon_view_;
 }
 
 views::View* LocationBarView::GetLocationBarAnchor() {
@@ -1047,6 +1051,9 @@ void LocationBarView::OnChanged() {
       *GetThemeProvider()->GetImageSkiaNamed((icon_id == IDR_OMNIBOX_SEARCH) ?
           IDR_OMNIBOX_SEARCH_BUTTON_LOUPE : IDR_OMNIBOX_SEARCH_BUTTON_ARROW));
 
+  if (site_chip_view_)
+    site_chip_view_->OnChanged();
+
   Layout();
   SchedulePaint();
 }