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

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

Issue 2149953002: Enable login screen apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Devlin and Maksim 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
Index: chrome/browser/extensions/chrome_process_manager_delegate.cc
diff --git a/chrome/browser/extensions/chrome_process_manager_delegate.cc b/chrome/browser/extensions/chrome_process_manager_delegate.cc
index e5804aab7c89b436ade61cc18225ba081b7f3229..d4af8644128c34e0d9b0f937cf8635f666ed2ae6 100644
--- a/chrome/browser/extensions/chrome_process_manager_delegate.cc
+++ b/chrome/browser/extensions/chrome_process_manager_delegate.cc
@@ -9,6 +9,7 @@
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/extensions/extension_management.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
@@ -19,8 +20,13 @@
#include "extensions/browser/extension_system.h"
#include "extensions/browser/process_manager.h"
#include "extensions/browser/process_manager_factory.h"
+#include "extensions/common/extension.h"
#include "extensions/common/one_shot_event.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
+#endif
+
namespace extensions {
ChromeProcessManagerDelegate::ChromeProcessManagerDelegate() {
@@ -39,14 +45,41 @@ ChromeProcessManagerDelegate::~ChromeProcessManagerDelegate() {
}
bool ChromeProcessManagerDelegate::IsBackgroundPageAllowed(
- content::BrowserContext* context) const {
+ content::BrowserContext* context,
+ const Extension* extension) const {
Profile* profile = static_cast<Profile*>(context);
bool is_normal_session = !profile->IsGuestSession() &&
!profile->IsSystemProfile();
+
#if defined(OS_CHROMEOS)
- is_normal_session = is_normal_session &&
- user_manager::UserManager::Get()->IsUserLoggedIn();
+ const bool is_signin_profile =
+ chromeos::ProfileHelper::IsSigninProfile(profile) &&
+ !profile->IsOffTheRecord();
+
+ if (is_signin_profile) {
+ // If an extension is specified, allow background pages only if that
+ // extension is in the login screen app list. Otherwise allow
+ // background pages.
+ if (!extension)
+ return true;
+
+ // Check for flag.
+ const bool login_screen_apps_enabled =
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableLoginScreenApps);
+
+ // Get login screen apps installed by policy.
+ std::unique_ptr<base::DictionaryValue> login_screen_apps_list =
+ ExtensionManagementFactory::GetForBrowserContext(context)
+ ->GetForceInstallList();
+
+ return login_screen_apps_enabled &&
+ login_screen_apps_list->HasKey(extension->id());
+ }
+
+ is_normal_session =
+ is_normal_session && user_manager::UserManager::Get()->IsUserLoggedIn();
#endif
// Disallow if the current session is a Guest mode session or login screen but

Powered by Google App Engine
This is Rietveld 408576698