Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Unified Diff: chrome/browser/about_flags.cc

Issue 731423002: Remove OriginChip code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad merge Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 8c731a726a7f717de0d50022f3d3418d8386d811..c6cbe98edbe488e1317b919b4f2a13e67df99a90 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -301,15 +301,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,
@@ -1647,13 +1638,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,

Powered by Google App Engine
This is Rietveld 408576698