summaryrefslogtreecommitdiffstats
path: root/chrome/default_plugin
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 03:55:47 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 03:55:47 +0000
commit542bdfe5dde965d920bfca1328d0f6e70e8dbb9b (patch)
tree69f191ddc519eef4fd2ad6c0fae3fc3e3f9f780e /chrome/default_plugin
parent4e212c3b271b13d22156945997443d00feed6e02 (diff)
downloadchromium_src-542bdfe5dde965d920bfca1328d0f6e70e8dbb9b.zip
chromium_src-542bdfe5dde965d920bfca1328d0f6e70e8dbb9b.tar.gz
chromium_src-542bdfe5dde965d920bfca1328d0f6e70e8dbb9b.tar.bz2
Revert 67662 - FBTF: Remove unneeded headers from base/ (part 10)
BUG=none TEST=none Review URL: http://codereview.chromium.org/5139006 TBR=thestig@chromium.org Review URL: http://codereview.chromium.org/5270010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67674 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/default_plugin')
-rw-r--r--chrome/default_plugin/plugin_install_job_monitor.cc6
-rw-r--r--chrome/default_plugin/plugin_install_job_monitor.h13
2 files changed, 9 insertions, 10 deletions
diff --git a/chrome/default_plugin/plugin_install_job_monitor.cc b/chrome/default_plugin/plugin_install_job_monitor.cc
index cbd50d1..4e19057 100644
--- a/chrome/default_plugin/plugin_install_job_monitor.cc
+++ b/chrome/default_plugin/plugin_install_job_monitor.cc
@@ -4,7 +4,6 @@
#include "chrome/default_plugin/plugin_install_job_monitor.h"
-#include "base/logging.h"
#include "base/message_loop.h"
#include "chrome/default_plugin/plugin_impl.h"
@@ -100,11 +99,6 @@ void PluginInstallationJobMonitorThread::Stop() {
install_job_completion_port_ = NULL;
}
-void PluginInstallationJobMonitorThread::set_plugin_window(HWND plugin_window) {
- DCHECK(::IsWindow(plugin_window));
- plugin_window_ = plugin_window;
-}
-
bool PluginInstallationJobMonitorThread::AssignProcessToJob(
HANDLE process_handle) {
BOOL result = AssignProcessToJobObject(install_job_, process_handle);
diff --git a/chrome/default_plugin/plugin_install_job_monitor.h b/chrome/default_plugin/plugin_install_job_monitor.h
index eb58145..5211f45 100644
--- a/chrome/default_plugin/plugin_install_job_monitor.h
+++ b/chrome/default_plugin/plugin_install_job_monitor.h
@@ -8,6 +8,7 @@
#include <windows.h>
+#include "base/logging.h"
#include "base/thread.h"
#include "base/ref_counted.h"
@@ -15,9 +16,10 @@
// The PluginInstallationJobMonitorThread class represents a background
// thread which monitors the install job completion port which is associated
// with the job when an instance of this class is initialized.
-class PluginInstallationJobMonitorThread
- : public base::Thread,
- public base::RefCountedThreadSafe<PluginInstallationJobMonitorThread> {
+class PluginInstallationJobMonitorThread :
+ public base::Thread,
+ public base::RefCountedThreadSafe<PluginInstallationJobMonitorThread> {
+
public:
PluginInstallationJobMonitorThread();
@@ -30,7 +32,10 @@ class PluginInstallationJobMonitorThread
void Stop();
// Simple setter/getters for the plugin window handle.
- void set_plugin_window(HWND plugin_window);
+ void set_plugin_window(HWND plugin_window) {
+ DCHECK(::IsWindow(plugin_window));
+ plugin_window_ = plugin_window;
+ }
HWND plugin_window() const {
return plugin_window_;