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

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

Issue 48103003: Enable Google Now on trybots (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index d8f0a840910c72136c9483a6f10c6a1557c3ab81..240ce7fe5fa4336bdd6fc4abebd889193830795d 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -516,10 +516,12 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
std::string field_trial_result =
base::FieldTrialList::FindFullName(kFieldTrialName);
Alexei Svitkine (slow) 2013/11/01 15:16:37 It seems this logic is also duplicated in geolocat
vadimt 2013/11/01 17:48:19 In geolocation, the code is pretty dead, and that
- bool enabled_via_field_trial = field_trial_result.compare(
- 0,
- enable_prefix.length(),
- enable_prefix) == 0;
+ bool enabled_via_field_trial =
+ field_trial_result.empty() ||
Alexei Svitkine (slow) 2013/11/01 15:16:37 Not convinced this is a good solution - for exampl
vadimt 2013/11/01 17:48:19 Done. I chose the second approach, since this is t
+ field_trial_result.compare(
+ 0,
+ enable_prefix.length(),
+ enable_prefix) == 0;
bool enabled_via_flag =
chrome::VersionInfo::GetChannel() !=
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698