content/gpu/gpu_main.cc - Issue 10990079: Clean up scoped_com_initializer.h. Remove #ifdefs for non-Windows (this is in base/win, no one sho…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/gpu/gpu_main.cc

Issue 10990079: Clean up scoped_com_initializer.h. Remove #ifdefs for non-Windows (this is in base/win, no one sho… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 3 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

« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/gpu/gpu_main.cc

===================================================================

--- content/gpu/gpu_main.cc (revision 158860)

+++ content/gpu/gpu_main.cc (working copy)

@@ -14,7 +14,6 @@

#include "base/string_number_conversions.h"

#include "base/stringprintf.h"

#include "base/threading/platform_thread.h"

-#include "base/win/scoped_com_initializer.h"

#include "build/build_config.h"

#include "content/common/gpu/gpu_config.h"

#include "content/gpu/gpu_child_thread.h"

@@ -30,6 +29,7 @@

#include "ui/gl/gpu_switching_manager.h"

#if defined(OS_WIN)

+#include "base/win/scoped_com_initializer.h"

#include "content/common/gpu/media/dxva_video_decode_accelerator.h"

#include "sandbox/win/src/sandbox.h"

#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)

@@ -288,12 +288,12 @@

}

#endif

+#if defined(OS_WIN)

{

TRACE_EVENT0("gpu", "Initialize COM");

base::win::ScopedCOMInitializer com_initializer;

}

-#if defined(OS_WIN)

{

TRACE_EVENT0("gpu", "Preload setupapi.dll");

// Preload this DLL because the sandbox prevents it from loading.