diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 07:51:54 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 07:51:54 +0000 |
| commit | f177ffd84b0f1b94de05fa0166520783cb5cddb9 (patch) | |
| tree | 54f755e0de2d845cd2d8b481f08c528911ce62d2 /content/browser/plugin_process_host_mac.cc | |
| parent | 57c1b56f4ae39e8cb1cd805fb46653423d4e5456 (diff) | |
| download | chromium_src-f177ffd84b0f1b94de05fa0166520783cb5cddb9.zip chromium_src-f177ffd84b0f1b94de05fa0166520783cb5cddb9.tar.gz chromium_src-f177ffd84b0f1b94de05fa0166520783cb5cddb9.tar.bz2 | |
Revert 118415 - Add a Content API around BrowserChildProcessHost, similar to what was done with ChildProcessHost. Now classes like PluginProcessHost don't derive from it, but instead use composition.
I've also moved the iterator class into its own file in the public directory. Since classes don't derive from BrowserChildProcessHost and so can't static_cast from it, I added a template helper that does this.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9150017
TBR=jam@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_process_host_mac.cc')
| -rw-r--r-- | content/browser/plugin_process_host_mac.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/content/browser/plugin_process_host_mac.cc b/content/browser/plugin_process_host_mac.cc index 883d301..91314b1 100644 --- a/content/browser/plugin_process_host_mac.cc +++ b/content/browser/plugin_process_host_mac.cc @@ -11,12 +11,9 @@ #include "base/bind.h" #include "base/logging.h" #include "base/mac/mac_util.h" -#include "base/process_util.h" -#include "content/browser/browser_child_process_host.h" #include "content/browser/plugin_process_host.h" #include "content/common/plugin_messages.h" #include "content/public/browser/browser_thread.h" -#include "content/public/browser/child_process_data.h" #include "ui/gfx/rect.h" using content::BrowserThread; @@ -78,8 +75,7 @@ void PluginProcessHost::OnPluginHideWindow(uint32 window_id, if (plugin_fullscreen_windows_set_.find(window_id) != plugin_fullscreen_windows_set_.end()) { plugin_fullscreen_windows_set_.erase(window_id); - pid_t plugin_pid = - browser_needs_activation ? -1 : process_->GetData().handle; + pid_t plugin_pid = browser_needs_activation ? -1 : data().handle; browser_needs_activation = false; BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(ReleasePluginFullScreen, plugin_pid)); @@ -100,7 +96,7 @@ void PluginProcessHost::OnAppActivation() { if (!plugin_modal_windows_set_.empty()) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - base::Bind(base::mac::ActivateProcess, process_->GetData().handle)); + base::Bind(base::mac::ActivateProcess, data().handle)); } } |