OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/nacl_host/nacl_browser_delegate_impl.h" | 5 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
6 | 6 |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/strings/string_split.h" | 8 #include "base/strings/string_split.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 10 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
| 11 #if defined(ENABLE_EXTENSIONS) |
11 #include "chrome/browser/extensions/extension_service.h" | 12 #include "chrome/browser/extensions/extension_service.h" |
| 13 #endif |
12 #include "chrome/browser/nacl_host/nacl_infobar_delegate.h" | 14 #include "chrome/browser/nacl_host/nacl_infobar_delegate.h" |
13 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/profiles/profile_manager.h" | 16 #include "chrome/browser/profiles/profile_manager.h" |
15 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" | 17 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" |
16 #include "chrome/common/chrome_paths.h" | 18 #include "chrome/common/chrome_paths.h" |
17 #include "chrome/common/chrome_paths_internal.h" | 19 #include "chrome/common/chrome_paths_internal.h" |
18 #include "chrome/common/chrome_version_info.h" | 20 #include "chrome/common/chrome_version_info.h" |
19 #include "chrome/common/logging_chrome.h" | 21 #include "chrome/common/logging_chrome.h" |
20 #include "chrome/common/pepper_permission_util.h" | 22 #include "chrome/common/pepper_permission_util.h" |
21 #include "content/public/browser/browser_thread.h" | 23 #include "content/public/browser/browser_thread.h" |
| 24 #if defined(ENABLE_EXTENSIONS) |
22 #include "extensions/browser/extension_system.h" | 25 #include "extensions/browser/extension_system.h" |
23 #include "extensions/browser/info_map.h" | 26 #include "extensions/browser/info_map.h" |
24 #include "extensions/browser/process_manager.h" | 27 #include "extensions/browser/process_manager.h" |
25 #include "extensions/common/constants.h" | 28 #include "extensions/common/constants.h" |
26 #include "extensions/common/extension.h" | 29 #include "extensions/common/extension.h" |
27 #include "extensions/common/url_pattern.h" | 30 #include "extensions/common/url_pattern.h" |
| 31 #endif |
28 #include "ppapi/c/private/ppb_nacl_private.h" | 32 #include "ppapi/c/private/ppb_nacl_private.h" |
29 #include "url/gurl.h" | 33 #include "url/gurl.h" |
30 | 34 |
31 namespace { | 35 namespace { |
32 | 36 |
33 // These are temporarily needed for testing non-sfi mode on ChromeOS without | 37 // These are temporarily needed for testing non-sfi mode on ChromeOS without |
34 // passing command-line arguments to Chrome. | 38 // passing command-line arguments to Chrome. |
35 const char* const kAllowedNonSfiOrigins[] = { | 39 const char* const kAllowedNonSfiOrigins[] = { |
36 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see http://crbug.com/355141 | 40 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see http://crbug.com/355141 |
37 "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see http://crbug.com/355141 | 41 "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see http://crbug.com/355141 |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 const base::FilePath& profile_directory) { | 229 const base::FilePath& profile_directory) { |
226 // Get the profile associated with the renderer. | 230 // Get the profile associated with the renderer. |
227 Profile* profile = profile_manager_->GetProfileByPath(profile_directory); | 231 Profile* profile = profile_manager_->GetProfileByPath(profile_directory); |
228 DCHECK(profile); | 232 DCHECK(profile); |
229 scoped_refptr<extensions::InfoMap> extension_info_map = | 233 scoped_refptr<extensions::InfoMap> extension_info_map = |
230 extensions::ExtensionSystem::Get(profile)->info_map(); | 234 extensions::ExtensionSystem::Get(profile)->info_map(); |
231 DCHECK(extension_info_map.get()); | 235 DCHECK(extension_info_map.get()); |
232 return extension_info_map; | 236 return extension_info_map; |
233 } | 237 } |
234 #endif | 238 #endif |
OLD | NEW |