Chromium Code Reviews| Index: chrome/browser/extensions/installed_loader.cc |
| diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc |
| index 4f3cf1bec413ebf5f774f03334147a1a082f12cc..aa7c1fc3c341d05653b508a7a02ed09c95786fbf 100644 |
| --- a/chrome/browser/extensions/installed_loader.cc |
| +++ b/chrome/browser/extensions/installed_loader.cc |
| @@ -42,6 +42,10 @@ |
| #include "extensions/common/manifest_handlers/background_info.h" |
| #include "extensions/common/manifest_url_handlers.h" |
| +#if defined(OS_CHROMEOS) |
| +#include "chrome/browser/chromeos/profiles/profile_helper.h" |
| +#endif |
| + |
| using base::UserMetricsAction; |
| using content::BrowserThread; |
| @@ -307,7 +311,15 @@ void InstalledLoader::LoadAllExtensions() { |
| } |
| for (size_t i = 0; i < extensions_info->size(); ++i) { |
| - if (extensions_info->at(i)->extension_location != Manifest::COMMAND_LINE) |
| + // Don't load saved extensions from the command line. |
| + bool should_load = |
| + extensions_info->at(i)->extension_location != Manifest::COMMAND_LINE; |
| +#if defined(OS_CHROMEOS) |
| + // Also don't load saved extensions in the signin profile. |
| + if (chromeos::ProfileHelper::IsSigninProfile(profile)) |
|
Devlin
2017/03/17 16:37:23
We should just early out of this whole function, o
achuithb
2017/03/22 00:15:53
Done.
|
| + should_load = false; |
| +#endif |
| + if (should_load) |
| Load(*extensions_info->at(i), should_write_prefs); |
| } |