Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1358)

Unified Diff: content/plugin/plugin_main.cc

Issue 9692001: Revert USER_LIMITED Flash changes (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 9 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
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/plugin_main.cc
===================================================================
--- content/plugin/plugin_main.cc (revision 126095)
+++ content/plugin/plugin_main.cc (working copy)
@@ -7,9 +7,6 @@
#if defined(OS_WIN)
#include <objbase.h>
#include <windows.h>
-// Some directx includes can trigger deprecation warnings.
-#pragma warning(disable:4995)
-#include <dshow.h>
#endif
#include "base/bind.h"
@@ -25,7 +22,6 @@
#include "content/public/common/main_function_params.h"
#if defined(OS_WIN)
-#include "base/win/scoped_comptr.h"
#include "content/common/injection_test_dll.h"
#include "sandbox/src/sandbox.h"
#elif defined(OS_POSIX) && !defined(OS_MACOSX)
@@ -180,13 +176,6 @@
if (!PreloadIMEForFlash())
DVLOG(1) << "IME preload failed";
-
- // 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);
-
DelayedLowerToken(target_services);
} else {
target_services->LowerToken();
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698