Remove origin chip v1 and "hide on input" v2 behavior.

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

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 0a034f35dcc2bcf91eb1a6006593bb75bd17249c..10c9c531aec25acde65b7964e5e1eefa17962398 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -49,7 +49,6 @@ class Profile;
 class SelectedKeywordView;
 class StarView;
 class TemplateURLService;
-class ToolbarOriginChipView;
 class TranslateIconView;
 class ZoomView;
 
@@ -194,11 +193,6 @@ class LocationBarView : public LocationBar,
   // The translate icon. It may not be visible.
   TranslateIconView* translate_icon_view() { return translate_icon_view_; }
 
-  void set_toolbar_origin_chip_view(
-      ToolbarOriginChipView* toolbar_origin_chip_view) {
-    toolbar_origin_chip_view_ = toolbar_origin_chip_view;
-  }
-
   // Returns the screen coordinates of the omnibox (where the URL text appears,
   // not where the icons are shown).
   gfx::Point GetOmniboxViewOrigin() const;
@@ -223,11 +217,8 @@ class LocationBarView : public LocationBar,
   // in the toolbar in full keyboard accessibility mode.
   virtual void SelectAll();
 
-  views::ImageView* GetLocationIconView();
-  const views::ImageView* GetLocationIconView() const;
+  LocationIconView* location_icon_view() { return location_icon_view_; }

[Justin Donnelly, 2014/05/13 22:19:33]

We should also have a const version of this, no?  That's how it used be:

http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/ui/views/locat...

[Peter Kasting, 2014/05/14 00:28:11]

No.  No one calls the const version, so we shouldn't have it; it's dead code.

 
-  // Return a view suitable for anchoring location-bar-anchored bubbles to.
-  views::View* GetLocationBarAnchor();
   // Return the point suitable for anchoring location-bar-anchored bubbles at.
   // The point will be returned in the coordinates of the LocationBarView.
   gfx::Point GetLocationBarAnchorPoint() const;
@@ -427,12 +418,9 @@ class LocationBarView : public LocationBar,
   // Object used to paint the border.
   scoped_ptr<views::Painter> border_painter_;
 
-  // The version of the origin chip that appears in the location bar.
+  // The origin chip that may appear in the location bar.
   OriginChipView* origin_chip_view_;
 
-  // The version of the origin chip that appears in the toolbar.
-  ToolbarOriginChipView* toolbar_origin_chip_view_;
-
   // An icon to the left of the edit field.
   LocationIconView* location_icon_view_;