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

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 423c9314405b890d76c26fa29cb1979eead264e9..a5d7fa0ce334936f970be236e2264c1e975b342d 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -697,8 +697,23 @@ const char kEnableOfflineAutoReload[]       = "enable-offline-auto-reload";
 const char kEnableOmniboxAutoCompletionForIme[] =
     "enable-omnibox-auto-completion-for-ime";
 
-// Enables the origin chip.
-const char kEnableOriginChip[]              = "enable-origin-chip";
+// Controls which branch of the origin chip experiment is enabled. The first
+// flag (enable-origin-chip) is equivalent to the third
+// (enable-origin-chip-trailing-location-bar) and exists for backwards
+// compatability with an earlier version of the experiment.
+//
+// We're using independent flags here (as opposed to a common flag with
+// different values) to be able to enable/disable the entire experience
+// associated with this feature server-side from the FieldTrial (the complete
+// experience includes other flag changes as well). It is not currently possible
+// to do that with "flag=value" flags.
+const char kEnableOriginChip[] = "enable-origin-chip";
+const char kEnableOriginChipLeadingLocationBar[] =
+    "enable-origin-chip-leading-location-bar";
+const char kEnableOriginChipTrailingLocationBar[] =
+    "enable-origin-chip-trailing-location-bar";
+const char kEnableOriginChipLeadingMenuButton[] =
+    "enable-origin-chip-leading-menu-button";
 
 // Enables panels (always on-top docked pop-up windows).
 const char kEnablePanels[]                  = "enable-panels";
@@ -741,12 +756,18 @@ const char kEnableSdch[]                    = "enable-sdch";
 
 // Controls which branch of the "search button in omnibox" experiment is
 // enabled.
+//
+// We're using independent flags here (as opposed to a common flag with
+// different values) to be able to enable/disable the entire experience
+// associated with this feature server-side from the FieldTrial (the complete
+// experience includes other flag changes as well). It is not currently possible
+// to do that with "flag=value" flags.
 const char kEnableSearchButtonInOmniboxAlways[] =
-        "enable-search-button-in-omnibox-always";
+    "enable-search-button-in-omnibox-always";
 const char kEnableSearchButtonInOmniboxForStr[] =
-        "enable-search-button-in-omnibox-for-str";
+    "enable-search-button-in-omnibox-for-str";
 const char kEnableSearchButtonInOmniboxForStrOrIip[] =
-        "enable-search-button-in-omnibox-for-str-or-iip";
+    "enable-search-button-in-omnibox-for-str-or-iip";
 
 // Enables support of sticky keys.
 const char kEnableStickyKeys[]              = "enable-sticky-keys";