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

chrome/browser/ui/omnibox/omnibox_view.cc

 // 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.
 
 // This file defines helper functions shared by the various implementations
 // of OmniboxView.
 
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 
 #include "base/strings/string16.h"
@@ skipping 70 matching lines @@
       return StripJavascriptSchemas(base::UTF8ToUTF16(url.spec()));
   }
 
   return base::string16();
 }
 
 OmniboxView::~OmniboxView() {
 }
 
 void OmniboxView::HandleOriginChipMouseRelease() {
-  // HIDE_ON_MOUSE_RELEASE only hides if there isn't any current text in the
-  // Omnibox (e.g. search terms).
-  if ((chrome::GetOriginChipV2Condition() ==
-       chrome::ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE) &&
-      controller()->GetToolbarModel()->GetText().empty()) {
+  // Only hide if there isn't any current text in the Omnibox (e.g. search
+  // terms).
+  if (controller()->GetToolbarModel()->GetText().empty())
     controller()->HideOriginChip();
-  }
 }
 
 void OmniboxView::OnDidKillFocus() {
-  if (chrome::ShouldDisplayOriginChipV2() &&
-      !model()->user_input_in_progress()) {
+  if (chrome::ShouldDisplayOriginChip() && !model()->user_input_in_progress())
     controller()->ShowOriginChip();
-  }
 }
 
 void OmniboxView::OpenMatch(const AutocompleteMatch& match,
                             WindowOpenDisposition disposition,
                             const GURL& alternate_nav_url,
                             const base::string16& pasted_text,
                             size_t selected_line) {
   // Invalid URLs such as chrome://history can end up here.
   if (!match.destination_url.is_valid() || !model_)
     return;
@@ skipping 107 matching lines @@
   // |profile| can be NULL in tests.
   if (profile)
     model_.reset(new OmniboxEditModel(this, controller, profile));
 }
 
 void OmniboxView::TextChanged() {
   EmphasizeURLComponents();
   if (model_.get())
     model_->OnChanged();
 }