| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index cb0815ab1a6bab4f1d1e97a430c61482636a78ad..4a0721470db34e073481769c711f10369939008c 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -361,15 +361,6 @@ const Experiment::Choice kSearchButtonInOmniboxChoices[] = {
|
| switches::kEnableSearchButtonInOmniboxAlways, ""}
|
| };
|
|
|
| -// See comment above for kSearchButtonInOmniboxChoices. The same reasoning
|
| -// applies here.
|
| -const Experiment::Choice kOriginChipChoices[] = {
|
| - { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
|
| - { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kDisableOriginChip, ""},
|
| - { IDS_FLAGS_ORIGIN_CHIP_ALWAYS, switches::kEnableOriginChipAlways, ""},
|
| - { IDS_FLAGS_ORIGIN_CHIP_ON_SRP, switches::kEnableOriginChipOnSrp, ""}
|
| -};
|
| -
|
| const Experiment::Choice kTouchScrollingModeChoices[] = {
|
| { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
|
| { IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL,
|
| @@ -1719,13 +1710,6 @@ const Experiment kExperiments[] = {
|
| MULTI_VALUE_TYPE(kNumRasterThreadsChoices)
|
| },
|
| {
|
| - "origin-chip-in-omnibox",
|
| - IDS_FLAGS_ORIGIN_CHIP_NAME,
|
| - IDS_FLAGS_ORIGIN_CHIP_DESCRIPTION,
|
| - kOsCrOS | kOsMac | kOsWin | kOsLinux,
|
| - MULTI_VALUE_TYPE(kOriginChipChoices)
|
| - },
|
| - {
|
| "search-button-in-omnibox",
|
| IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_NAME,
|
| IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_DESCRIPTION,
|
|
|