[OriginChip] Add options for the position of the origin chip.

chrome/browser/search/search.cc

 // 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.
 
 #include "chrome/browser/search/search.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
@@ skipping 51 matching lines @@
 // The staleness timeout can be set (in seconds) via this config.
 const char kStalePageTimeoutFlagName[] = "stale";
 const int kStalePageTimeoutDefault = 3 * 3600;  // 3 hours.
 
 const char kHideVerbatimFlagName[] = "hide_verbatim";
 const char kShowNtpFlagName[] = "show_ntp";
 const char kUseCacheableNTP[] = "use_cacheable_ntp";
 const char kPrefetchSearchResultsFlagName[] = "prefetch_results";
 const char kPrefetchSearchResultsOnSRP[] = "prefetch_results_srp";
 const char kDisplaySearchButtonFlagName[] = "display_search_button";
-const char kEnableOriginChipFlagName[] = "origin_chip";
+const char kOriginChipFlagName[] = "origin_chip";
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
 const char kEnableQueryExtractionFlagName[] = "query_extraction";
 #endif
 
 // Constants for the field trial name and group prefix.
 // Note in M30 and below this field trial was named "InstantExtended" and in
 // M31 was renamed to EmbeddedSearch for clarity and cleanliness.  Since we
 // can't easilly sync up Finch configs with the pushing of this change to
 // Dev & Canary, for now the code accepts both names.
 // TODO(dcblack): Remove the InstantExtended name once M31 hits the Beta
@@ skipping 456 matching lines @@
   if (!GetFieldTrialInfo(&flags))
     return DISPLAY_SEARCH_BUTTON_NEVER;
   uint64 value =
       GetUInt64ValueForFlagWithDefault(kDisplaySearchButtonFlagName, 0, flags);
   return (value < DISPLAY_SEARCH_BUTTON_NUM_VALUES) ?
       static_cast<DisplaySearchButtonConditions>(value) :
       DISPLAY_SEARCH_BUTTON_NEVER;
 }
 
 bool ShouldDisplayOriginChip() {
+  return GetOriginChipPosition() != ORIGIN_CHIP_DISABLED;
+}
+
+OriginChipPosition GetOriginChipPosition() {
   const CommandLine* cl = CommandLine::ForCurrentProcess();
   if (cl->HasSwitch(switches::kDisableOriginChip)) {
-    return false;
-  } else if (cl->HasSwitch(switches::kEnableOriginChip)) {
-    return true;
+    return ORIGIN_CHIP_DISABLED;
+  } else if (cl->HasSwitch(switches::kEnableOriginChipLeftOfLocationBar)) {
+    return ORIGIN_CHIP_LEFT_OF_LOCATION_BAR;
+  } else if (cl->HasSwitch(switches::kEnableOriginChip) ||
+             cl->HasSwitch(switches::kEnableOriginChipRightOfLocationBar)) {
+    return ORIGIN_CHIP_RIGHT_OF_LOCATION_BAR;
+  } else if (cl->HasSwitch(switches::kEnableOriginChipLeftOfMenu)) {
+    return ORIGIN_CHIP_LEFT_OF_MENU;
   }
 
   FieldTrialFlags flags;
-  return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(
-      kEnableOriginChipFlagName, false, flags);
+  if (!GetFieldTrialInfo(&flags))
+    return ORIGIN_CHIP_DISABLED;
+  uint64 value =
+      GetUInt64ValueForFlagWithDefault(kOriginChipFlagName, 0, flags);
+  return (value < ORIGIN_CHIP_NUM_VALUES) ?
+      static_cast<OriginChipPosition>(value) :
+      ORIGIN_CHIP_DISABLED;
 }
 
 GURL GetEffectiveURLForInstant(const GURL& url, Profile* profile) {
   CHECK(ShouldAssignURLToInstantRenderer(url, profile))
       << "Error granting Instant access.";
 
   if (url.SchemeIs(chrome::kChromeSearchScheme))
     return url;
 
   GURL effective_url(url);
@@ skipping 178 matching lines @@
 
 // Given a FieldTrialFlags object, returns the boolean value of the provided
 // flag.
 bool GetBoolValueForFlagWithDefault(const std::string& flag,
                                     bool default_value,
                                     const FieldTrialFlags& flags) {
   return !!GetUInt64ValueForFlagWithDefault(flag, default_value ? 1 : 0, flags);
 }
 
 }  // namespace chrome