Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1771)

Unified Diff: chrome/browser/nacl_host/nacl_browser_delegate_impl.h

Issue 264923011: Add a whitelist check for nacl-nonsfi mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add includes (windows compile fail) Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/nacl_host/nacl_browser_delegate_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « no previous file | chrome/browser/nacl_host/nacl_browser_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698