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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 33053002: Pepper: Move FileIO host from renderer to browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for bbudge Created 7 years, 2 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
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 912a3745b78b939b10abfc4554f6241595120b82..2f6cdec66c99ebcf3a60ff2b7cf58c5e1b9532ec 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -208,24 +208,12 @@ bool ShouldUseJavaScriptSettingForPlugin(const WebPluginInfo& plugin) {
return false;
}
-#if defined(ENABLE_PLUGINS)
-const char* kPredefinedAllowedFileHandleOrigins[] = {
- "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/234789
- "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see crbug.com/234789
-};
-#endif
-
} // namespace
namespace chrome {
ChromeContentRendererClient::ChromeContentRendererClient() {
g_current_client = this;
-
-#if defined(ENABLE_PLUGINS)
- for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i)
- allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]);
-#endif
}
ChromeContentRendererClient::~ChromeContentRendererClient() {
@@ -1303,23 +1291,6 @@ bool ChromeContentRendererClient::IsExternalPepperPlugin(
return module_name == "Native Client";
}
-bool ChromeContentRendererClient::IsPluginAllowedToCallRequestOSFileHandle(
- WebKit::WebPluginContainer* container) {
-#if defined(ENABLE_PLUGINS)
- if (!container)
- return false;
- GURL url = container->element().document().baseURL();
- const ExtensionSet* extension_set = extension_dispatcher_->extensions();
-
- return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
- allowed_file_handle_origins_) ||
- IsHostAllowedByCommandLine(url, extension_set,
- switches::kAllowNaClFileHandleAPI);
-#else
- return false;
-#endif
-}
-
WebKit::WebSpeechSynthesizer*
ChromeContentRendererClient::OverrideSpeechSynthesizer(
WebKit::WebSpeechSynthesizerClient* client) {

Powered by Google App Engine
This is Rietveld 408576698