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

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

Issue 13610005: Prevent loading of component extensions in kiosk mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index ecdebb36b86c6479726751c794e8556817454834..b724c381ca33ea86fb7423ffc0cd6cd3b85be071 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -49,6 +49,7 @@
#include "content/public/browser/url_data_source.h"
#if defined(OS_CHROMEOS)
+#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#endif
@@ -162,9 +163,14 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
#if defined(OS_CHROMEOS)
// Skip loading session extensions if we are not in a user session.
skip_session_extensions = !chromeos::UserManager::Get()->IsUserLoggedIn();
-#endif
+ if (!chrome::IsRunningInForcedAppMode()) {
+ extension_service_->component_loader()->AddDefaultComponentExtensions(
+ skip_session_extensions);
+ }
+#else
extension_service_->component_loader()->AddDefaultComponentExtensions(
skip_session_extensions);
+#endif
if (command_line->HasSwitch(switches::kLoadComponentExtension)) {
CommandLine::StringType path_list = command_line->GetSwitchValueNative(
switches::kLoadComponentExtension);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698