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

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: Rebased Created 7 years, 1 month 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 | « chrome/renderer/chrome_content_renderer_client.h ('k') | content/browser/fileapi/fileapi_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ff8e5959ca6e2d4cb48a4713840c9e5ad04a3a6b..926ccd36d6a832c5d862790c4984888aaf0c640e 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -209,22 +209,10 @@ 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
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() {
@@ -1304,24 +1292,6 @@ bool ChromeContentRendererClient::IsExternalPepperPlugin(
return module_name == "Native Client";
}
-bool ChromeContentRendererClient::IsPluginAllowedToCallRequestOSFileHandle(
- blink::WebPluginContainer* container) {
-#if defined(ENABLE_PLUGINS)
- if (!container)
- return false;
- GURL url = container->element().document().baseURL();
- const ExtensionSet* extension_set = extension_dispatcher_->extensions();
-
- if (chrome::IsExtensionOrSharedModuleWhitelisted(
- url, extension_set, allowed_file_handle_origins_) ||
- chrome::IsHostAllowedByCommandLine(
- url, extension_set, switches::kAllowNaClFileHandleAPI)) {
- return true;
- }
-#endif
- return false;
-}
-
blink::WebSpeechSynthesizer*
ChromeContentRendererClient::OverrideSpeechSynthesizer(
blink::WebSpeechSynthesizerClient* client) {
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.h ('k') | content/browser/fileapi/fileapi_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698