content/renderer/render_thread_impl.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/renderer/render_thread_impl.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

Index: content/renderer/render_thread_impl.cc

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

--- content/renderer/render_thread_impl.cc (revision 158860)

+++ content/renderer/render_thread_impl.cc (working copy)

@@ -23,7 +23,6 @@

#include "base/threading/thread_local.h"

#include "base/utf_string_conversions.h"

#include "base/values.h"

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

#include "content/common/appcache/appcache_dispatcher.h"

#include "content/common/child_histogram_message_filter.h"

#include "content/common/child_process_messages.h"

@@ -97,17 +96,16 @@

#include "v8/include/v8.h"

#include "webkit/glue/webkit_glue.h"

+#if defined(OS_WIN)

+#include <windows.h>

+#include <objbase.h>

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

+#else

// TODO(port)

-#if !defined(OS_WIN)

#include "base/memory/scoped_handle.h"

#include "content/common/np_channel_base.h"

#endif

-#if defined(OS_WIN)

-#include <windows.h>

-#include <objbase.h>

-#endif

#if defined(OS_POSIX)

#include "ipc/ipc_channel_posix.h"

#endif

« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/renderer/render_thread_impl.h ('k') | content/test/content_test_suite.h » ('j') | no next file with comments »