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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1213333003: Build public cast_shell on x86 with GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Modifies gn args to make cast_shell run! Created 5 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 #include "content/renderer/java/gin_java_bridge_dispatcher.h" 167 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
168 #include "content/renderer/media/android/renderer_media_player_manager.h" 168 #include "content/renderer/media/android/renderer_media_player_manager.h"
169 #include "content/renderer/media/android/stream_texture_factory_impl.h" 169 #include "content/renderer/media/android/stream_texture_factory_impl.h"
170 #include "content/renderer/media/android/webmediaplayer_android.h" 170 #include "content/renderer/media/android/webmediaplayer_android.h"
171 #else 171 #else
172 #include "cc/blink/context_provider_web_context.h" 172 #include "cc/blink/context_provider_web_context.h"
173 #endif 173 #endif
174 174
175 #if defined(ENABLE_PEPPER_CDMS) 175 #if defined(ENABLE_PEPPER_CDMS)
176 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h" 176 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h"
177 #elif defined(ENABLE_BROWSER_CDMS) 177 // TODO(slan): Figure out why line 4989 doesn't vibe.
gunsch 2015/08/04 00:43:10 did you figure it out?
slan 2015/08/04 21:22:04 Resolved: https://codereview.chromium.org/12666930
178 // #elif defined(ENABLE_BROWSER_CDMS)
178 #include "content/renderer/media/crypto/renderer_cdm_manager.h" 179 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
179 #endif 180 #endif
180 181
181 #if defined(ENABLE_MOJO_MEDIA) 182 #if defined(ENABLE_MOJO_MEDIA)
182 #include "media/mojo/services/mojo_cdm_factory.h" 183 #include "media/mojo/services/mojo_cdm_factory.h"
183 #include "media/mojo/services/mojo_renderer_factory.h" 184 #include "media/mojo/services/mojo_renderer_factory.h"
184 #include "mojo/application/public/interfaces/shell.mojom.h" 185 #include "mojo/application/public/interfaces/shell.mojom.h"
185 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" 186 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
186 #else 187 #else
187 #include "media/renderers/default_renderer_factory.h" 188 #include "media/renderers/default_renderer_factory.h"
(...skipping 4848 matching lines...) Expand 10 before | Expand all | Expand 10 after
5036 void RenderFrameImpl::RegisterMojoServices() { 5037 void RenderFrameImpl::RegisterMojoServices() {
5037 // Only main frame have ImageDownloader service. 5038 // Only main frame have ImageDownloader service.
5038 if (!frame_->parent()) { 5039 if (!frame_->parent()) {
5039 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( 5040 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>(
5040 base::Bind(&ImageDownloaderImpl::CreateMojoService, 5041 base::Bind(&ImageDownloaderImpl::CreateMojoService,
5041 base::Unretained(this))); 5042 base::Unretained(this)));
5042 } 5043 }
5043 } 5044 }
5044 5045
5045 } // namespace content 5046 } // namespace content
OLDNEW
« chromecast/build/args.gn ('K') | « chromecast/renderer/BUILD.gn ('k') | ui/ozone/ozone.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698