Index: chrome/browser/nacl_host/nacl_browser_delegate_impl.h |
diff --git a/chrome/browser/nacl_host/nacl_browser_delegate_impl.h b/chrome/browser/nacl_host/nacl_browser_delegate_impl.h |
index 086e1d88e27d2b3b8eb7f451c707286a6dd7f3ea..dd25389308c842ae249e56db2888712d3ac3a55c 100644 |
--- a/chrome/browser/nacl_host/nacl_browser_delegate_impl.h |
+++ b/chrome/browser/nacl_host/nacl_browser_delegate_impl.h |
@@ -5,10 +5,17 @@ |
#ifndef CHROME_BROWSER_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_ |
#define CHROME_BROWSER_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_ |
+#include <set> |
+#include <string> |
+ |
#include "base/compiler_specific.h" |
#include "components/nacl/browser/nacl_browser_delegate.h" |
#include "extensions/common/url_pattern.h" |
+namespace extensions { |
+class InfoMap; |
+} |
+ |
class ProfileManager; |
class NaClBrowserDelegateImpl : public NaClBrowserDelegate { |
@@ -34,11 +41,16 @@ class NaClBrowserDelegateImpl : public NaClBrowserDelegate { |
virtual bool URLMatchesDebugPatterns(const GURL& manifest_url) OVERRIDE; |
virtual content::BrowserPpapiHost::OnKeepaliveCallback |
GetOnKeepaliveCallback() OVERRIDE; |
+ virtual bool IsNonSfiModeAllowed(const base::FilePath& profile_directory, |
+ const GURL& manifest_url) OVERRIDE; |
private: |
+ scoped_refptr<extensions::InfoMap> GetExtensionInfoMap( |
+ const base::FilePath& profile_directory); |
ProfileManager* profile_manager_; |
std::vector<URLPattern> debug_patterns_; |
bool inverse_debug_patterns_; |
+ std::set<std::string> allowed_nonsfi_origins_; |
DISALLOW_COPY_AND_ASSIGN(NaClBrowserDelegateImpl); |
}; |