diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 00:14:50 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 00:14:50 +0000 |
| commit | 9ed25b4b4f6faafa69c5892ab940f511123f3833 (patch) | |
| tree | 9b10b47dfc9d9011d2b2008f32caa9e01d1b219c /content/plugin | |
| parent | ca7bf99722aba545be42a6bff618c9cfa020941f (diff) | |
| download | chromium_src-9ed25b4b4f6faafa69c5892ab940f511123f3833.zip chromium_src-9ed25b4b4f6faafa69c5892ab940f511123f3833.tar.gz chromium_src-9ed25b4b4f6faafa69c5892ab940f511123f3833.tar.bz2 | |
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
Diffstat (limited to 'content/plugin')
| -rw-r--r-- | content/plugin/plugin_main.cc | 6 |
1 files changed, 4 insertions, 2 deletions
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<ICreateDevEnum> device_enumerator; - device_enumerator.CreateInstance(CLSID_SystemDeviceEnum); + device_enumerator.CreateInstance(CLSID_SystemDeviceEnum, NULL, + CLSCTX_INPROC_SERVER | + CLSCTX_INPROC_HANDLER); DelayedLowerToken(target_services); } else { |