diff options
| author | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 01:01:27 +0000 |
|---|---|---|
| committer | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 01:01:27 +0000 |
| commit | 1a5bc31078d3d796638a9fb0a5bbf72ea9232dca (patch) | |
| tree | a1d90d16165314f9f1d9d5fb79dc264d21c247ae | |
| parent | a0b6514ea4502854372a13d9138dd3722859412a (diff) | |
| download | chromium_src-1a5bc31078d3d796638a9fb0a5bbf72ea9232dca.zip chromium_src-1a5bc31078d3d796638a9fb0a5bbf72ea9232dca.tar.gz chromium_src-1a5bc31078d3d796638a9fb0a5bbf72ea9232dca.tar.bz2 | |
Revert 124511 - 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
TBR=jschuh@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9646021
git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@125747 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/plugin/plugin_main.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc index 2e7f4ea..89f1d6d 100644 --- a/content/plugin/plugin_main.cc +++ b/content/plugin/plugin_main.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -183,9 +183,7 @@ 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, NULL, - CLSCTX_INPROC_SERVER | - CLSCTX_INPROC_HANDLER); + device_enumerator.CreateInstance(CLSID_SystemDeviceEnum); DelayedLowerToken(target_services); } else { |