OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/extensions/extension_system.h" | 5 #include "chrome/browser/extensions/extension_system.h" |
6 | 6 |
7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
194 install_verifier_->Init(); | 194 install_verifier_->Init(); |
195 | 195 |
196 management_policy_.reset(new ManagementPolicy); | 196 management_policy_.reset(new ManagementPolicy); |
197 RegisterManagementPolicyProviders(); | 197 RegisterManagementPolicyProviders(); |
198 } | 198 } |
199 | 199 |
200 bool skip_session_extensions = false; | 200 bool skip_session_extensions = false; |
201 #if defined(OS_CHROMEOS) | 201 #if defined(OS_CHROMEOS) |
202 // Skip loading session extensions if we are not in a user session. | 202 // Skip loading session extensions if we are not in a user session. |
203 skip_session_extensions = !chromeos::LoginState::Get()->IsUserLoggedIn(); | 203 skip_session_extensions = !chromeos::LoginState::Get()->IsUserLoggedIn(); |
204 if (!chrome::IsRunningInForcedAppMode()) { | 204 if (chrome::IsRunningInForcedAppMode()) { |
| 205 extension_service_->component_loader()-> |
| 206 AddDefaultComponentExtensionsForKioskMode(skip_session_extensions); |
| 207 } else { |
205 extension_service_->component_loader()->AddDefaultComponentExtensions( | 208 extension_service_->component_loader()->AddDefaultComponentExtensions( |
206 skip_session_extensions); | 209 skip_session_extensions); |
207 } | 210 } |
208 #else | 211 #else |
209 extension_service_->component_loader()->AddDefaultComponentExtensions( | 212 extension_service_->component_loader()->AddDefaultComponentExtensions( |
210 skip_session_extensions); | 213 skip_session_extensions); |
211 #endif | 214 #endif |
212 if (command_line->HasSwitch(switches::kLoadComponentExtension)) { | 215 if (command_line->HasSwitch(switches::kLoadComponentExtension)) { |
213 CommandLine::StringType path_list = command_line->GetSwitchValueNative( | 216 CommandLine::StringType path_list = command_line->GetSwitchValueNative( |
214 switches::kLoadComponentExtension); | 217 switches::kLoadComponentExtension); |
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts( | 439 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts( |
437 const std::string& extension_id, | 440 const std::string& extension_id, |
438 const UnloadedExtensionInfo::Reason reason) { | 441 const UnloadedExtensionInfo::Reason reason) { |
439 BrowserThread::PostTask( | 442 BrowserThread::PostTask( |
440 BrowserThread::IO, | 443 BrowserThread::IO, |
441 FROM_HERE, | 444 FROM_HERE, |
442 base::Bind(&InfoMap::RemoveExtension, info_map(), extension_id, reason)); | 445 base::Bind(&InfoMap::RemoveExtension, info_map(), extension_id, reason)); |
443 } | 446 } |
444 | 447 |
445 } // namespace extensions | 448 } // namespace extensions |
OLD | NEW |