diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 09:11:12 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 09:11:12 +0000 |
| commit | 1a771269be8885389b4269e14714759f0fcf8660 (patch) | |
| tree | e1ead1f2def25f9569ece9fb2159191f8b14c769 /content/renderer/render_thread_impl.h | |
| parent | 63f535e8c38a14ffd483c6415ec079b414212a8f (diff) | |
| download | chromium_src-1a771269be8885389b4269e14714759f0fcf8660.zip chromium_src-1a771269be8885389b4269e14714759f0fcf8660.tar.gz chromium_src-1a771269be8885389b4269e14714759f0fcf8660.tar.bz2 | |
Change RenderThread to use ScopedCOMInitializer to initialize COM.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8341107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107933 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_thread_impl.h')
| -rw-r--r-- | content/renderer/render_thread_impl.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index 35a8c47a..47181d2 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -56,6 +56,9 @@ class WebStorageEventDispatcher; namespace base { class MessageLoopProxy; class Thread; +namespace win { +class ScopedCOMInitializer; +} } namespace content { @@ -211,6 +214,9 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread, // Used on multiple script execution context threads. scoped_ptr<WebDatabaseObserverImpl> web_database_observer_impl_; + // Initialize COM when using plugins outside the sandbox (Windows only). + scoped_ptr<base::win::ScopedCOMInitializer> initialize_com_; + // If true, then a GetPlugins call is allowed to rescan the disk. bool plugin_refresh_allowed_; |