Chromium Code Reviews| Index: chrome/browser/extensions/extension_service.cc |
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc |
| index 46ddb77bd244b70ec9440edda53a4dffc945c18c..4a63663b31a855f6798271518ac608df11090bb4 100644 |
| --- a/chrome/browser/extensions/extension_service.cc |
| +++ b/chrome/browser/extensions/extension_service.cc |
| @@ -105,6 +105,7 @@ |
| #if defined(OS_CHROMEOS) |
| #include "chrome/browser/chromeos/extensions/install_limiter.h" |
| +#include "chrome/browser/chromeos/profiles/profile_helper.h" |
| #include "storage/browser/fileapi/file_system_backend.h" |
| #include "storage/browser/fileapi/file_system_context.h" |
| #endif |
| @@ -441,7 +442,15 @@ void ExtensionService::Init() { |
| // LoadAllExtensions() calls OnLoadedInstalledExtensions(). |
| component_loader_->LoadAll(); |
| - extensions::InstalledLoader(this).LoadAllExtensions(); |
| + bool load_saved_extensions = true; |
| +#if defined(OS_CHROMEOS) |
| + if (chromeos::ProfileHelper::IsSigninProfile(profile_)) |
| + load_saved_extensions = false; |
| +#endif |
| + if (load_saved_extensions) |
| + extensions::InstalledLoader(this).LoadAllExtensions(); |
| + else |
| + OnLoadedInstalledExtensions(); // Callback from LoadAllExtensions. |
|
Devlin
2017/03/22 22:57:39
nit: elaborate a bit on this comment. Also, this f
achuithb
2017/03/23 00:26:26
Done.
I thought about refactoring this, but I thi
|
| LoadExtensionsFromCommandLineFlag(switches::kDisableExtensionsExcept); |
| if (extensions_enabled_) |
| LoadExtensionsFromCommandLineFlag(switches::kLoadExtension); |