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

Unified Diff: chrome/browser/search/search.cc

Issue 266263002: [OriginChip] Add an option to display only on search result pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to comments Created 6 years, 7 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/browser/search/search.h ('k') | chrome/browser/search/search_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search/search.cc
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 46ea5d7e4e3ab02515a255dc344330ff31a90a0b..a7cff4c4a856c0ca21019fe5760366737430c917 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -652,10 +652,10 @@ OriginChipPosition GetOriginChipPosition() {
}
bool ShouldDisplayOriginChipV2() {
- return GetOriginChipV2HideTrigger() != ORIGIN_CHIP_V2_DISABLED;
+ return GetOriginChipV2Condition() != ORIGIN_CHIP_V2_DISABLED;
}
-OriginChipV2HideTrigger GetOriginChipV2HideTrigger() {
+OriginChipV2Condition GetOriginChipV2Condition() {
const CommandLine* cl = CommandLine::ForCurrentProcess();
if (cl->HasSwitch(switches::kDisableOriginChipV2))
return ORIGIN_CHIP_V2_DISABLED;
@@ -663,6 +663,8 @@ OriginChipV2HideTrigger GetOriginChipV2HideTrigger() {
return ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE;
if (cl->HasSwitch(switches::kEnableOriginChipV2HideOnUserInput))
return ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT;
+ if (cl->HasSwitch(switches::kEnableOriginChipV2OnSrp))
+ return ORIGIN_CHIP_V2_ON_SRP;
FieldTrialFlags flags;
if (!GetFieldTrialInfo(&flags))
@@ -670,7 +672,7 @@ OriginChipV2HideTrigger GetOriginChipV2HideTrigger() {
uint64 value =
GetUInt64ValueForFlagWithDefault(kOriginChipV2FlagName, 0, flags);
return (value < ORIGIN_CHIP_V2_NUM_VALUES) ?
- static_cast<OriginChipV2HideTrigger>(value) :
+ static_cast<OriginChipV2Condition>(value) :
ORIGIN_CHIP_V2_DISABLED;
}
« no previous file with comments | « chrome/browser/search/search.h ('k') | chrome/browser/search/search_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698