Chromium Code Reviews| Index: chrome/browser/extensions/component_loader.cc |
| diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc |
| index 20d08009a2e3cbf2ce88a64753f6a7e87242f462..c05815a60ef294992172f500a87617a45c6cc42b 100644 |
| --- a/chrome/browser/extensions/component_loader.cc |
| +++ b/chrome/browser/extensions/component_loader.cc |
| @@ -12,6 +12,7 @@ |
| #include "base/metrics/field_trial.h" |
| #include "base/path_service.h" |
| #include "chrome/browser/extensions/extension_service.h" |
| +#include "chrome/browser/signin/easy_unlock.h" |
| #include "chrome/common/chrome_paths.h" |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/common/chrome_version_info.h" |
| @@ -592,8 +593,7 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( |
| AddNetworkSpeechSynthesisExtension(); |
| #endif |
| - if (!skip_session_components && |
| - command_line->HasSwitch(switches::kEnableEasyUnlock)) { |
| + if (!skip_session_components && easy_unlock::IsEnabled()) { |
| if (command_line->HasSwitch(switches::kEasyUnlockAppPath)) { |
| base::FilePath easy_unlock_path( |
| command_line->GetSwitchValuePath(switches::kEasyUnlockAppPath)); |
|
Alexei Svitkine (slow)
2014/07/22 18:18:40
Hmm, what happens if its enabled via field trial b
Tim Song
2014/07/22 18:36:09
No component app will be installed in this case.
xiyuan
2014/07/22 20:00:23
The non-cros release plan is still unclear ATM. Cr
|