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

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

Issue 941633004: Moved renderer implementation from media/filters/ to media/renderers/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed android build Created 5 years, 10 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 | « content/renderer/pepper/video_decoder_shim.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 #if defined(ENABLE_PEPPER_CDMS) 162 #if defined(ENABLE_PEPPER_CDMS)
163 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h" 163 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h"
164 #elif defined(ENABLE_BROWSER_CDMS) 164 #elif defined(ENABLE_BROWSER_CDMS)
165 #include "content/renderer/media/crypto/renderer_cdm_manager.h" 165 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
166 #endif 166 #endif
167 167
168 #if defined(ENABLE_MEDIA_MOJO_RENDERER) 168 #if defined(ENABLE_MEDIA_MOJO_RENDERER)
169 #include "content/renderer/media/media_renderer_service_provider.h" 169 #include "content/renderer/media/media_renderer_service_provider.h"
170 #include "media/mojo/services/mojo_renderer_factory.h" 170 #include "media/mojo/services/mojo_renderer_factory.h"
171 #else 171 #else
172 #include "media/filters/default_renderer_factory.h" 172 #include "media/renderers/default_renderer_factory.h"
173 #endif 173 #endif
174 174
175 using blink::WebContextMenuData; 175 using blink::WebContextMenuData;
176 using blink::WebData; 176 using blink::WebData;
177 using blink::WebDataSource; 177 using blink::WebDataSource;
178 using blink::WebDocument; 178 using blink::WebDocument;
179 using blink::WebElement; 179 using blink::WebElement;
180 using blink::WebExternalPopupMenu; 180 using blink::WebExternalPopupMenu;
181 using blink::WebExternalPopupMenuClient; 181 using blink::WebExternalPopupMenuClient;
182 using blink::WebFrame; 182 using blink::WebFrame;
(...skipping 4259 matching lines...) Expand 10 before | Expand all | Expand 10 after
4442 4442
4443 #if defined(ENABLE_BROWSER_CDMS) 4443 #if defined(ENABLE_BROWSER_CDMS)
4444 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4444 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4445 if (!cdm_manager_) 4445 if (!cdm_manager_)
4446 cdm_manager_ = new RendererCdmManager(this); 4446 cdm_manager_ = new RendererCdmManager(this);
4447 return cdm_manager_; 4447 return cdm_manager_;
4448 } 4448 }
4449 #endif // defined(ENABLE_BROWSER_CDMS) 4449 #endif // defined(ENABLE_BROWSER_CDMS)
4450 4450
4451 } // namespace content 4451 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/video_decoder_shim.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698