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

Unified Diff: chrome/browser/search/search.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/search/search.cc
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index a1d5a71038dbf1062df4ad8d5b1789bee71e1f79..a0b285168e39b3bfedc948c4bb771878c5d5d24b 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -66,7 +66,6 @@ const char kAltInstantURLPath[] = "search";
const char kAltInstantURLQueryParams[] = "&qbp=1";
const char kDisplaySearchButtonFlagName[] = "display_search_button";
-const char kOriginChipFlagName[] = "origin_chip";
#if !defined(OS_IOS) && !defined(OS_ANDROID)
const char kEnableQueryExtractionFlagName[] = "query_extraction";
#endif
@@ -604,28 +603,6 @@ DisplaySearchButtonConditions GetDisplaySearchButtonConditions() {
DISPLAY_SEARCH_BUTTON_NEVER;
}
-bool ShouldDisplayOriginChip() {
- return GetOriginChipCondition() != ORIGIN_CHIP_DISABLED;
-}
-
-OriginChipCondition GetOriginChipCondition() {
- const base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
- if (cl->HasSwitch(switches::kDisableOriginChip))
- return ORIGIN_CHIP_DISABLED;
- if (cl->HasSwitch(switches::kEnableOriginChipAlways))
- return ORIGIN_CHIP_ALWAYS;
- if (cl->HasSwitch(switches::kEnableOriginChipOnSrp))
- return ORIGIN_CHIP_ON_SRP;
-
- FieldTrialFlags flags;
- if (!GetFieldTrialInfo(&flags))
- return ORIGIN_CHIP_DISABLED;
- uint64 value =
- GetUInt64ValueForFlagWithDefault(kOriginChipFlagName, 0, flags);
- return (value < ORIGIN_CHIP_NUM_VALUES) ?
- static_cast<OriginChipCondition>(value) : ORIGIN_CHIP_DISABLED;
-}
-
bool ShouldShowGoogleLocalNTP() {
FieldTrialFlags flags;
return !GetFieldTrialInfo(&flags) || GetBoolValueForFlagWithDefault(

Powered by Google App Engine
This is Rietveld 408576698