chrome/browser/extensions/component_loader.cc - Issue 21985002: Add Finch Checks to the State Machine

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/component_loader.cc

Issue 21985002: Add Finch Checks to the State Machine (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@SMLog

Patch Set: Rolling In Dependent Fixes Created 7 years, 4 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:

Index: chrome/browser/extensions/component_loader.cc

diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc

index 36d6be519f7e746d10a5a133e7d1ed01bb85df33..5bc9af30e69ae1548249c43b3b7ad10675c82aab 100644

--- a/chrome/browser/extensions/component_loader.cc

+++ b/chrome/browser/extensions/component_loader.cc

@@ -470,7 +470,10 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(

#endif // defined(OS_CHROMEOS)

#if defined(ENABLE_GOOGLE_NOW)

- if (base::FieldTrialList::FindFullName("GoogleNow") == "Enable" ||

+ std::string enablePrefix("Enable");

+ std::string fieldTrialResult =

+ base::FieldTrialList::FindFullName("GoogleNow");

+ if ((fieldTrialResult.compare(0, enablePrefix.length(), enablePrefix) == 0) ||

CommandLine::ForCurrentProcess()->HasSwitch(

switches::kEnableGoogleNowIntegration)) {

Add(IDR_GOOGLE_NOW_MANIFEST,