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" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "chrome/common/pepper_permission_util.h" | 22 #include "chrome/common/pepper_permission_util.h" |
23 #include "content/public/browser/browser_thread.h" | 23 #include "content/public/browser/browser_thread.h" |
24 #if defined(ENABLE_EXTENSIONS) | 24 #if defined(ENABLE_EXTENSIONS) |
25 #include "extensions/browser/extension_system.h" | 25 #include "extensions/browser/extension_system.h" |
26 #include "extensions/browser/info_map.h" | 26 #include "extensions/browser/info_map.h" |
27 #include "extensions/browser/process_manager.h" | 27 #include "extensions/browser/process_manager.h" |
28 #include "extensions/common/constants.h" | 28 #include "extensions/common/constants.h" |
29 #include "extensions/common/extension.h" | 29 #include "extensions/common/extension.h" |
30 #include "extensions/common/url_pattern.h" | 30 #include "extensions/common/url_pattern.h" |
31 #endif | 31 #endif |
32 #include "ppapi/c/private/ppb_nacl_private.h" | |
33 #include "url/gurl.h" | 32 #include "url/gurl.h" |
34 | 33 |
35 namespace { | 34 namespace { |
36 | 35 |
37 // These are temporarily needed for testing non-sfi mode on ChromeOS without | 36 // These are temporarily needed for testing non-sfi mode on ChromeOS without |
38 // passing command-line arguments to Chrome. | 37 // passing command-line arguments to Chrome. |
39 const char* const kAllowedNonSfiOrigins[] = { | 38 const char* const kAllowedNonSfiOrigins[] = { |
40 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see http://crbug.com/355141 | 39 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see http://crbug.com/355141 |
41 "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see http://crbug.com/355141 | 40 "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see http://crbug.com/355141 |
42 }; | 41 }; |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 const base::FilePath& profile_directory) { | 238 const base::FilePath& profile_directory) { |
240 // Get the profile associated with the renderer. | 239 // Get the profile associated with the renderer. |
241 Profile* profile = profile_manager_->GetProfileByPath(profile_directory); | 240 Profile* profile = profile_manager_->GetProfileByPath(profile_directory); |
242 DCHECK(profile); | 241 DCHECK(profile); |
243 scoped_refptr<extensions::InfoMap> extension_info_map = | 242 scoped_refptr<extensions::InfoMap> extension_info_map = |
244 extensions::ExtensionSystem::Get(profile)->info_map(); | 243 extensions::ExtensionSystem::Get(profile)->info_map(); |
245 DCHECK(extension_info_map.get()); | 244 DCHECK(extension_info_map.get()); |
246 return extension_info_map; | 245 return extension_info_map; |
247 } | 246 } |
248 #endif | 247 #endif |
OLD | NEW |