content/plugin/plugin_main.cc - Issue 11050009: Use ScopedCOMInitializer in more places. While this doesn't always simplify code, it does mean we …

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/plugin/plugin_main.cc

Issue 11050009: Use ScopedCOMInitializer in more places. While this doesn't always simplify code, it does mean we … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome_frame/utils.h ('K') | « content/browser/renderer_host/render_process_host_impl.cc ('k') | net/url_request/url_request_unittest.cc » ('j') | net/url_request/url_request_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/plugin/plugin_main.cc

===================================================================

--- content/plugin/plugin_main.cc (revision 159813)

+++ content/plugin/plugin_main.cc (working copy)

@@ -5,7 +5,6 @@

#include "build/build_config.h"

#if defined(OS_WIN)

-#include <objbase.h>

#include <windows.h>

#endif

@@ -22,6 +21,7 @@

#include "content/public/common/main_function_params.h"

#if defined(OS_WIN)

+#include "base/win/scoped_com_initializer.h"

#include "content/public/common/injection_test_win.h"

#include "sandbox/win/src/sandbox.h"

#elif defined(OS_POSIX) && !defined(OS_MACOSX)

@@ -118,7 +118,8 @@

sandbox::TargetServices* target_services =

parameters.sandbox_info->target_services;

- CoInitialize(NULL);

+ base::win::ScopedCOMInitializer com_initializer;

DVLOG(1) << "Started plugin with "

<< parsed_command_line.GetCommandLineString();

@@ -183,7 +184,6 @@

#if defined(OS_WIN)

DestroyIMEForFlash();

- CoUninitialize();

#endif

return 0;