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

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

Index: chrome/browser/ui/views/location_bar/location_icon_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc
index a096cd84e6a0675a6a86976a3aa00ae5236d2f24..5c77541dabbceb5508694d4d296d4a7208b1a85f 100644
--- a/chrome/browser/ui/views/location_bar/location_icon_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -58,8 +57,7 @@ void LocationIconView::OnClickOrTap(const ui::LocatedEvent& event) {
   // location bar is at the NTP.  Also skip showing the page info if the

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

Remove "Also skip showing..."

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

I could have sworn I did this already.  Done.

   // toolbar-based origin chip is being shown because it is responsible for
   // showing the page info instead.
-  if (page_info_helper_.location_bar()->GetOmniboxView()->IsEditingOrEmpty() ||
-      chrome::ShouldDisplayOriginChip())
+  if (page_info_helper_.location_bar()->GetOmniboxView()->IsEditingOrEmpty())
     return;
 
   page_info_helper_.ProcessEvent(event);