diff options
| author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 03:25:24 +0000 |
|---|---|---|
| committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 03:25:24 +0000 |
| commit | d146b8bf4a1ed1860452e0ebdeb9c52c135226e2 (patch) | |
| tree | 27012d7f0c43fdfe8dacab51ddfdd9861a9fae7c /chrome/browser | |
| parent | f121ad61e72e32caf56df8732f2eee90343781b1 (diff) | |
| download | chromium_src-d146b8bf4a1ed1860452e0ebdeb9c52c135226e2.zip chromium_src-d146b8bf4a1ed1860452e0ebdeb9c52c135226e2.tar.gz chromium_src-d146b8bf4a1ed1860452e0ebdeb9c52c135226e2.tar.bz2 | |
Revert 171080
> 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
TBR=raymes@chromium.org
Review URL: https://codereview.chromium.org/11437038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171389 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, 6 insertions, 1 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index a188c1c..8a2daec 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -1826,6 +1826,11 @@ 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 53a89f3..75ce0ae 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h @@ -213,6 +213,7 @@ 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 eef1dac..8c5a86b 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -771,7 +771,6 @@ 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(), |