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

Unified Diff: chrome/browser/profiles/profile_manager.cc

Issue 2149953002: Enable login screen apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Stefan feedback Created 3 years, 9 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 | « chrome/browser/extensions/external_provider_impl.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_manager.cc
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 0c4229c8eb8db14d8d3625af514b2d39dfb0202c..c50dac04170c77b9090d5246873e58d7720e1b38 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -1211,8 +1211,16 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,
HostContentSettingsMap* content_settings_map =
HostContentSettingsMapFactory::GetForProfile(profile);
+ bool extensions_enabled = !go_off_the_record;
+#if defined(OS_CHROMEOS)
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableLoginScreenApps) &&
+ chromeos::ProfileHelper::IsSigninProfile(profile)) {
+ extensions_enabled = true;
+ }
+#endif
extensions::ExtensionSystem::Get(profile)->InitForRegularProfile(
- !go_off_the_record);
+ extensions_enabled);
// During tests, when |profile| is an instance of TestingProfile,
// ExtensionSystem might not create an ExtensionService.
// This block is duplicated in the HostContentSettingsMapFactory
« no previous file with comments | « chrome/browser/extensions/external_provider_impl.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698