diff options
| author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 23:32:50 +0000 |
|---|---|---|
| committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 23:32:50 +0000 |
| commit | 2432c058351cb5b4da6b1c5a9c756d1758c9ee5d (patch) | |
| tree | 372850500a04180aa8e45c38347010a15398eaee /chrome/browser | |
| parent | f574c40f701805a0da0129915a9dc691cd79d355 (diff) | |
| download | chromium_src-2432c058351cb5b4da6b1c5a9c756d1758c9ee5d.zip chromium_src-2432c058351cb5b4da6b1c5a9c756d1758c9ee5d.tar.gz chromium_src-2432c058351cb5b4da6b1c5a9c756d1758c9ee5d.tar.bz2 | |
The refactors PPB_Flash_File_ModuleLocal/FileRef to the new resource model. Calls for both these interfaces are now made directly to the browser. This removes the in-process implementation for these interfaces also (as they are flash-only). Tests are added for PPB_Flash_File_ModuleLocal.
Review URL: https://codereview.chromium.org/11359097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.h | 1 | ||||
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 2c9ea56..ed16096 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -1824,11 +1824,6 @@ bool ChromeContentBrowserClient::AllowPepperSocketAPI( return false; } -bool ChromeContentBrowserClient::AllowPepperPrivateFileAPI() { - return CommandLine::ForCurrentProcess()->HasSwitch( - switches::kPpapiFlashInProcess); -} - FilePath ChromeContentBrowserClient::GetHyphenDictionaryDirectory() { FilePath directory; PathService::Get(chrome::DIR_APP_DICTIONARIES, &directory); diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h index 75ce0ae..53a89f3 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h @@ -213,7 +213,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { content::BrowserContext* browser_context, const GURL& url, const content::SocketPermissionRequest& params) OVERRIDE; - virtual bool AllowPepperPrivateFileAPI() OVERRIDE; virtual FilePath GetHyphenDictionaryDirectory() OVERRIDE; #if defined(OS_POSIX) && !defined(OS_MACOSX) diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 8c5a86b..eef1dac 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -771,6 +771,7 @@ void NaClProcessHost::OnPpapiChannelCreated( ipc_proxy_channel_.get(), //process_.get(), // sender permissions_, process_->GetData().handle, + process_->GetData().id, ipc_proxy_channel_.get(), chrome_render_message_filter_->GetHostResolver(), chrome_render_message_filter_->render_process_id(), |