| Index: extensions/shell/browser/shell_nacl_browser_delegate.cc
|
| diff --git a/extensions/shell/browser/shell_nacl_browser_delegate.cc b/extensions/shell/browser/shell_nacl_browser_delegate.cc
|
| index 88db0fd7407b8dd638c9b75cdb581372d3811723..303dcad2e0c828fdf59a6248de7922f9985ae455 100644
|
| --- a/extensions/shell/browser/shell_nacl_browser_delegate.cc
|
| +++ b/extensions/shell/browser/shell_nacl_browser_delegate.cc
|
| @@ -30,39 +30,6 @@ using content::BrowserThread;
|
| using content::BrowserPpapiHost;
|
|
|
| namespace extensions {
|
| -namespace {
|
| -
|
| -// Handles an extension's NaCl process transitioning in or out of idle state by
|
| -// relaying the state to the extension's process manager. See Chrome's
|
| -// NaClBrowserDelegateImpl for another example.
|
| -void OnKeepaliveOnUIThread(
|
| - const BrowserPpapiHost::OnKeepaliveInstanceData& instance_data,
|
| - const base::FilePath& profile_data_directory) {
|
| - DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| -
|
| - // Only one instance will exist for NaCl embeds, even when more than one
|
| - // embed of the same plugin exists on the same page.
|
| - DCHECK(instance_data.size() == 1);
|
| - if (instance_data.size() < 1)
|
| - return;
|
| -
|
| - ProcessManager::OnKeepaliveFromPlugin(instance_data[0].render_process_id,
|
| - instance_data[0].render_frame_id,
|
| - instance_data[0].document_url.host());
|
| -}
|
| -
|
| -// Calls OnKeepaliveOnUIThread on UI thread.
|
| -void OnKeepalive(const BrowserPpapiHost::OnKeepaliveInstanceData& instance_data,
|
| - const base::FilePath& profile_data_directory) {
|
| - DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| - BrowserThread::PostTask(
|
| - BrowserThread::UI,
|
| - FROM_HERE,
|
| - base::Bind(
|
| - &OnKeepaliveOnUIThread, instance_data, profile_data_directory));
|
| -}
|
| -
|
| -} // namespace
|
|
|
| ShellNaClBrowserDelegate::ShellNaClBrowserDelegate(BrowserContext* context)
|
| : browser_context_(context) {
|
| @@ -182,11 +149,6 @@ bool ShellNaClBrowserDelegate::MapUrlToLocalFilePath(
|
| return true;
|
| }
|
|
|
| -content::BrowserPpapiHost::OnKeepaliveCallback
|
| -ShellNaClBrowserDelegate::GetOnKeepaliveCallback() {
|
| - return base::Bind(&OnKeepalive);
|
| -}
|
| -
|
| bool ShellNaClBrowserDelegate::IsNonSfiModeAllowed(
|
| const base::FilePath& profile_directory,
|
| const GURL& manifest_url) {
|
|
|