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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 267323008: Missing OS guard before including android header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bindings_thin
Patch Set: Created 6 years, 7 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "content/browser/frame_host/render_frame_message_filter.h" 52 #include "content/browser/frame_host/render_frame_message_filter.h"
53 #include "content/browser/gpu/compositor_util.h" 53 #include "content/browser/gpu/compositor_util.h"
54 #include "content/browser/gpu/gpu_data_manager_impl.h" 54 #include "content/browser/gpu/gpu_data_manager_impl.h"
55 #include "content/browser/gpu/gpu_process_host.h" 55 #include "content/browser/gpu/gpu_process_host.h"
56 #include "content/browser/gpu/shader_disk_cache.h" 56 #include "content/browser/gpu/shader_disk_cache.h"
57 #include "content/browser/histogram_message_filter.h" 57 #include "content/browser/histogram_message_filter.h"
58 #include "content/browser/indexed_db/indexed_db_context_impl.h" 58 #include "content/browser/indexed_db/indexed_db_context_impl.h"
59 #include "content/browser/indexed_db/indexed_db_dispatcher_host.h" 59 #include "content/browser/indexed_db/indexed_db_dispatcher_host.h"
60 #include "content/browser/loader/resource_message_filter.h" 60 #include "content/browser/loader/resource_message_filter.h"
61 #include "content/browser/loader/resource_scheduler_filter.h" 61 #include "content/browser/loader/resource_scheduler_filter.h"
62 #include "content/browser/media/android/browser_demuxer_android.h"
63 #include "content/browser/media/capture/audio_mirroring_manager.h" 62 #include "content/browser/media/capture/audio_mirroring_manager.h"
64 #include "content/browser/media/media_internals.h" 63 #include "content/browser/media/media_internals.h"
65 #include "content/browser/message_port_message_filter.h" 64 #include "content/browser/message_port_message_filter.h"
66 #include "content/browser/mime_registry_message_filter.h" 65 #include "content/browser/mime_registry_message_filter.h"
67 #include "content/browser/mojo/mojo_application_host.h" 66 #include "content/browser/mojo/mojo_application_host.h"
68 #include "content/browser/plugin_service_impl.h" 67 #include "content/browser/plugin_service_impl.h"
69 #include "content/browser/profiler_message_filter.h" 68 #include "content/browser/profiler_message_filter.h"
70 #include "content/browser/push_messaging_message_filter.h" 69 #include "content/browser/push_messaging_message_filter.h"
71 #include "content/browser/quota_dispatcher_host.h" 70 #include "content/browser/quota_dispatcher_host.h"
72 #include "content/browser/renderer_host/clipboard_message_filter.h" 71 #include "content/browser/renderer_host/clipboard_message_filter.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 #include "ppapi/shared_impl/ppapi_switches.h" 142 #include "ppapi/shared_impl/ppapi_switches.h"
144 #include "third_party/skia/include/core/SkBitmap.h" 143 #include "third_party/skia/include/core/SkBitmap.h"
145 #include "ui/base/ui_base_switches.h" 144 #include "ui/base/ui_base_switches.h"
146 #include "ui/events/event_switches.h" 145 #include "ui/events/event_switches.h"
147 #include "ui/gfx/switches.h" 146 #include "ui/gfx/switches.h"
148 #include "ui/gl/gl_switches.h" 147 #include "ui/gl/gl_switches.h"
149 #include "ui/native_theme/native_theme_switches.h" 148 #include "ui/native_theme/native_theme_switches.h"
150 #include "webkit/browser/fileapi/sandbox_file_system_backend.h" 149 #include "webkit/browser/fileapi/sandbox_file_system_backend.h"
151 #include "webkit/common/resource_type.h" 150 #include "webkit/common/resource_type.h"
152 151
152 #if defined(OS_ANDROID)
153 #include "content/browser/media/android/browser_demuxer_android.h"
154 #endif
155
153 #if defined(OS_WIN) 156 #if defined(OS_WIN)
154 #include "base/win/scoped_com_initializer.h" 157 #include "base/win/scoped_com_initializer.h"
155 #include "content/common/font_cache_dispatcher_win.h" 158 #include "content/common/font_cache_dispatcher_win.h"
156 #include "content/common/sandbox_win.h" 159 #include "content/common/sandbox_win.h"
157 #endif 160 #endif
158 161
159 #if defined(ENABLE_WEBRTC) 162 #if defined(ENABLE_WEBRTC)
160 #include "content/browser/media/webrtc_internals.h" 163 #include "content/browser/media/webrtc_internals.h"
161 #include "content/browser/renderer_host/media/media_stream_track_metrics_host.h" 164 #include "content/browser/renderer_host/media/media_stream_track_metrics_host.h"
162 #include "content/browser/renderer_host/media/webrtc_identity_service_host.h" 165 #include "content/browser/renderer_host/media/webrtc_identity_service_host.h"
(...skipping 1912 matching lines...) Expand 10 before | Expand all | Expand 10 after
2075 mojo::ScopedMessagePipeHandle handle) { 2078 mojo::ScopedMessagePipeHandle handle) {
2076 mojo_activation_required_ = true; 2079 mojo_activation_required_ = true;
2077 MaybeActivateMojo(); 2080 MaybeActivateMojo();
2078 2081
2079 mojo::AllocationScope scope; 2082 mojo::AllocationScope scope;
2080 mojo_application_host_->shell_client()->AcceptConnection(service_name, 2083 mojo_application_host_->shell_client()->AcceptConnection(service_name,
2081 handle.Pass()); 2084 handle.Pass());
2082 } 2085 }
2083 2086
2084 } // namespace content 2087 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698