From 9ed25b4b4f6faafa69c5892ab940f511123f3833 Mon Sep 17 00:00:00 2001 From: "jschuh@chromium.org" Date: Tue, 14 Feb 2012 00:14:50 +0000 Subject: Fix how we warm up the device enumerator for Flash Change the warmup flags so we don't cause DCOM initialization. BUG=113891 Review URL: http://codereview.chromium.org/9350048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121772 0039d316-1c4b-4281-b951-d872f2087c98 --- content/plugin/plugin_main.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'content/plugin') diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc index 59f3a7b..4bf2d8f 100644 --- a/content/plugin/plugin_main.cc +++ b/content/plugin/plugin_main.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -141,7 +141,9 @@ int PluginMain(const content::MainFunctionParams& parameters) { // Warm up the device enumerator for webcam and microphone. base::win::ScopedComPtr device_enumerator; - device_enumerator.CreateInstance(CLSID_SystemDeviceEnum); + device_enumerator.CreateInstance(CLSID_SystemDeviceEnum, NULL, + CLSCTX_INPROC_SERVER | + CLSCTX_INPROC_HANDLER); DelayedLowerToken(target_services); } else { -- cgit v1.1