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

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 gyp file and bad merge Created 5 years, 10 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/ui/simple_web_view_dialog.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 7cf1c2e0d9263052f99a4da2fbf204faa19b1502..57e4cce29bad8201a5146018892434efed9bcc27 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -341,15 +341,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 kExtensionContentVerificationChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
{ IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_BOOTSTRAP,
@@ -1693,13 +1684,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,
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/ui/simple_web_view_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698