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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 31 matching lines @@
 class LocationIconView;
 class OpenPDFInReaderView;
 class ManagePasswordsIconView;
 class OriginChipView;
 class PageActionWithBadgeView;
 class PageActionImageView;
 class Profile;
 class SelectedKeywordView;
 class StarView;
 class TemplateURLService;
-class ToolbarOriginChipView;
 class TranslateIconView;
 class ZoomView;
 
 namespace content {
 struct SSLStatus;
 }
 
 namespace gfx {
 class SlideAnimation;
 }
@@ skipping 124 matching lines @@
 
   // The star. It may not be visible.
   StarView* star_view() { return star_view_; }
 
   // Toggles the translate icon on or off.
   void SetTranslateIconToggled(bool on);
 
   // 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;
 
   // Shows |text| as an inline autocompletion.  This is useful for IMEs, where
   // we can't show the autocompletion inside the actual OmniboxView.  See
   // comments on |ime_inline_autocomplete_view_|.
   void SetImeInlineAutocompletion(const base::string16& text);
 
   // Invoked from OmniboxViewWin to show gray text autocompletion.
   void SetGrayTextAutocompletion(const base::string16& text);
 
   // Returns the current gray text autocompletion.
   base::string16 GetGrayTextAutocompletion() const;
 
   // Set if we should show a focus rect while the location entry field is
   // focused. Used when the toolbar is in full keyboard accessibility mode.
   // Repaints if necessary.
   virtual void SetShowFocusRect(bool show);
 
   // Select all of the text. Needed when the user tabs through controls
   // 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;
 
   OmniboxViewViews* omnibox_view() { return omnibox_view_; }
 
   views::View* generated_credit_card_view();
 
   // Returns the height of the control without the top and bottom
   // edges(i.e.  the height of the edit control inside).  If
@@ skipping 179 matching lines @@
   Browser* browser_;
 
   OmniboxViewViews* omnibox_view_;
 
   // Our delegate.
   Delegate* delegate_;
 
   // 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_;
 
   // A bubble displayed for EV HTTPS sites.
   EVBubbleView* ev_bubble_view_;
 
   // A view to show inline autocompletion when an IME is active.  In this case,
   // we shouldn't change the text or selection inside the OmniboxView itself,
   // since this will conflict with the IME's control over the text.  So instead
   // we show any autocompletion in a separate field after the OmniboxView.
@@ skipping 79 matching lines @@
   // Used to register for notifications received by NotificationObserver.
   content::NotificationRegistrar registrar_;
 
   // Used to bind callback functions to this object.
   base::WeakPtrFactory<LocationBarView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_