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

chrome/browser/search/search.h

 // Copyright 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_SEARCH_SEARCH_H_
 #define CHROME_BROWSER_SEARCH_SEARCH_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 30 matching lines @@
 };
 
 enum DisplaySearchButtonConditions {
   DISPLAY_SEARCH_BUTTON_NEVER,
   DISPLAY_SEARCH_BUTTON_FOR_STR,         // STR = Search Term Replacement
   DISPLAY_SEARCH_BUTTON_FOR_STR_OR_IIP,  // IIP = Input In Progress
   DISPLAY_SEARCH_BUTTON_ALWAYS,
   DISPLAY_SEARCH_BUTTON_NUM_VALUES,
 };
 
-enum OriginChipPosition {
-  ORIGIN_CHIP_DISABLED,
-  ORIGIN_CHIP_LEADING_LOCATION_BAR,
-  ORIGIN_CHIP_TRAILING_LOCATION_BAR,
-  ORIGIN_CHIP_LEADING_MENU_BUTTON,
+enum OriginChipCondition {
+  ORIGIN_CHIP_DISABLED = 0,
+  ORIGIN_CHIP_ALWAYS,
+  ORIGIN_CHIP_ON_SRP,
   ORIGIN_CHIP_NUM_VALUES,
 };
 
-enum OriginChipV2Condition {
-  ORIGIN_CHIP_V2_DISABLED,
-  ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE,
-  ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT,
-  ORIGIN_CHIP_V2_ON_SRP,
-  ORIGIN_CHIP_V2_NUM_VALUES,
-};
-
 // Use this value for "start margin" to prevent the "es_sm" parameter from
 // being used.
 extern const int kDisableStartMargin;
 
 // Returns whether the Instant Extended API is enabled.
 bool IsInstantExtendedAPIEnabled();
 
 // Returns whether the suggest is enabled for the given |profile|.
 bool IsSuggestPrefEnabled(Profile* profile);
 
@@ skipping 110 matching lines @@
 // to hide the top match in the native suggestions dropdown if it is a verbatim
 // match.  See comments on ShouldHideTopMatch in autocomplete_result.h.
 bool ShouldHideTopVerbatimMatch();
 
 // Returns when we should show a search button in the omnibox.  This may be any
 // of several values, some of which depend on whether the underlying state of
 // the page would normally be to perform search term replacement; see also
 // ToolbarModel::WouldPerformSearchTermReplacement().
 DisplaySearchButtonConditions GetDisplaySearchButtonConditions();
 
-// Returns true if the origin chip should be shown in the toolbar. This
-// also includes the related changes to the omnibox. Always returns false if
-// ShouldDisplayOriginChipV2() returns true.
+// Returns true if the origin chip should be shown.
 bool ShouldDisplayOriginChip();
 
-// Returns a value indicating where the origin chip should be positioned on the
-// toolbar.
-OriginChipPosition GetOriginChipPosition();
-
-// Returns true if version 2 of the origin chip should be shown.  This version
-// places the origin chip inside the location bar instead of the toolbar and
-// adds show/hide behavior and animations to make the relationship between the
-// chip and the text in the Omnibox clearer.
-bool ShouldDisplayOriginChipV2();
-
-// Returns a value indicating what event should trigger hiding the origin chip
-// in the location bar.
-OriginChipV2Condition GetOriginChipV2Condition();
+// Returns a value indicating when the origin chip should be shown.
+OriginChipCondition GetOriginChipCondition();
 
 // Returns true if the local new tab page should show a Google logo and search
 // box for users whose default search provider is Google, or false if not.
 bool ShouldShowGoogleLocalNTP();
 
 // Transforms the input |url| into its "effective URL". The returned URL
 // facilitates grouping process-per-site. The |url| is transformed, for
 // example, from
 //
 //   https://www.google.com/search?espv=1&q=tractors
@@ skipping 72 matching lines @@
 bool GetBoolValueForFlagWithDefault(const std::string& flag,
                                     bool default_value,
                                     const FieldTrialFlags& flags);
 
 // Returns the Cacheable New Tab Page URL for the given |profile|.
 GURL GetNewTabPageURL(Profile* profile);
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_SEARCH_SEARCH_H_