diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 22:51:43 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 22:51:43 +0000 |
| commit | 48d2d88d686b6719bb3903edf5734f2d54144031 (patch) | |
| tree | b808baba117ba9af996da3644b0442d421cd1c5b | |
| parent | 6d64f7bfd7593c508d799f423daf29a150867955 (diff) | |
| download | chromium_src-48d2d88d686b6719bb3903edf5734f2d54144031.zip chromium_src-48d2d88d686b6719bb3903edf5734f2d54144031.tar.gz chromium_src-48d2d88d686b6719bb3903edf5734f2d54144031.tar.bz2 | |
Merge 121772 - 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
TBR=jschuh@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9570036
git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@124511 0039d316-1c4b-4281-b951-d872f2087c98
| -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 { |