| 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 "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 11 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
| 12 #include "chrome/browser/extensions/extension_info_map.h" | |
| 13 #include "chrome/browser/extensions/extension_system.h" | 12 #include "chrome/browser/extensions/extension_system.h" |
| 14 #include "chrome/browser/nacl_host/nacl_infobar_delegate.h" | 13 #include "chrome/browser/nacl_host/nacl_infobar_delegate.h" |
| 15 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" | 14 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" |
| 16 #include "chrome/common/chrome_paths.h" | 15 #include "chrome/common/chrome_paths.h" |
| 17 #include "chrome/common/chrome_paths_internal.h" | 16 #include "chrome/common/chrome_paths_internal.h" |
| 18 #include "chrome/common/chrome_version_info.h" | 17 #include "chrome/common/chrome_version_info.h" |
| 19 #include "chrome/common/extensions/extension.h" | 18 #include "chrome/common/extensions/extension.h" |
| 20 #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" | 19 #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" |
| 21 #include "chrome/common/logging_chrome.h" | 20 #include "chrome/common/logging_chrome.h" |
| 22 #include "content/public/browser/browser_thread.h" | 21 #include "content/public/browser/browser_thread.h" |
| 22 #include "extensions/browser/info_map.h" |
| 23 #include "extensions/common/constants.h" | 23 #include "extensions/common/constants.h" |
| 24 #include "extensions/common/url_pattern.h" | 24 #include "extensions/common/url_pattern.h" |
| 25 #include "ppapi/c/private/ppb_nacl_private.h" | 25 #include "ppapi/c/private/ppb_nacl_private.h" |
| 26 | 26 |
| 27 using extensions::SharedModuleInfo; | 27 using extensions::SharedModuleInfo; |
| 28 | 28 |
| 29 NaClBrowserDelegateImpl::NaClBrowserDelegateImpl( | 29 NaClBrowserDelegateImpl::NaClBrowserDelegateImpl( |
| 30 ExtensionInfoMap* extension_info_map) | 30 extensions::InfoMap* extension_info_map) |
| 31 : extension_info_map_(extension_info_map), | 31 : extension_info_map_(extension_info_map), inverse_debug_patterns_(false) {} |
| 32 inverse_debug_patterns_(false) { | |
| 33 } | |
| 34 | 32 |
| 35 NaClBrowserDelegateImpl::~NaClBrowserDelegateImpl() { | 33 NaClBrowserDelegateImpl::~NaClBrowserDelegateImpl() { |
| 36 } | 34 } |
| 37 | 35 |
| 38 void NaClBrowserDelegateImpl::ShowNaClInfobar(int render_process_id, | 36 void NaClBrowserDelegateImpl::ShowNaClInfobar(int render_process_id, |
| 39 int render_view_id, | 37 int render_view_id, |
| 40 int error_id) { | 38 int error_id) { |
| 41 DCHECK_EQ(PP_NACL_MANIFEST_MISSING_ARCH, error_id); | 39 DCHECK_EQ(PP_NACL_MANIFEST_MISSING_ARCH, error_id); |
| 42 content::BrowserThread::PostTask( | 40 content::BrowserThread::PostTask( |
| 43 content::BrowserThread::UI, FROM_HERE, | 41 content::BrowserThread::UI, FROM_HERE, |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 return false; | 174 return false; |
| 177 | 175 |
| 178 // GetFilePath is a blocking function call. | 176 // GetFilePath is a blocking function call. |
| 179 const base::FilePath resource_file_path = resource.GetFilePath(); | 177 const base::FilePath resource_file_path = resource.GetFilePath(); |
| 180 if (resource_file_path.empty()) | 178 if (resource_file_path.empty()) |
| 181 return false; | 179 return false; |
| 182 | 180 |
| 183 *file_path = resource_file_path; | 181 *file_path = resource_file_path; |
| 184 return true; | 182 return true; |
| 185 } | 183 } |
| OLD | NEW |