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

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

Issue 1565343003: Move mojo/application/public -> mojo/shell/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fetcher
Patch Set: . Created 4 years, 11 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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 #endif 207 #endif
208 208
209 #if defined(ENABLE_PEPPER_CDMS) 209 #if defined(ENABLE_PEPPER_CDMS)
210 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h" 210 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"
211 #elif defined(ENABLE_BROWSER_CDMS) 211 #elif defined(ENABLE_BROWSER_CDMS)
212 #include "content/renderer/media/cdm/renderer_cdm_manager.h" 212 #include "content/renderer/media/cdm/renderer_cdm_manager.h"
213 #endif 213 #endif
214 214
215 #if defined(ENABLE_MOJO_MEDIA) 215 #if defined(ENABLE_MOJO_MEDIA)
216 #include "media/mojo/services/mojo_cdm_factory.h" // nogncheck 216 #include "media/mojo/services/mojo_cdm_factory.h" // nogncheck
217 #include "mojo/application/public/cpp/connect.h"
218 #include "mojo/application/public/interfaces/shell.mojom.h"
219 #include "mojo/public/cpp/bindings/interface_request.h" 217 #include "mojo/public/cpp/bindings/interface_request.h"
218 #include "mojo/shell/public/cpp/connect.h"
219 #include "mojo/shell/public/interfaces/shell.mojom.h"
220 #endif 220 #endif
221 221
222 #if defined(ENABLE_MOJO_MEDIA) && !defined(OS_ANDROID) 222 #if defined(ENABLE_MOJO_MEDIA) && !defined(OS_ANDROID)
223 #include "media/mojo/services/mojo_renderer_factory.h" // nogncheck 223 #include "media/mojo/services/mojo_renderer_factory.h" // nogncheck
224 #else 224 #else
225 #include "media/renderers/default_renderer_factory.h" 225 #include "media/renderers/default_renderer_factory.h"
226 #endif 226 #endif
227 227
228 #if defined(ENABLE_WEBVR) 228 #if defined(ENABLE_WEBVR)
229 #include "content/renderer/vr/vr_dispatcher.h" 229 #include "content/renderer/vr/vr_dispatcher.h"
(...skipping 5459 matching lines...) Expand 10 before | Expand all | Expand 10 after
5689 media::ConvertToSwitchOutputDeviceCB(web_callbacks); 5689 media::ConvertToSwitchOutputDeviceCB(web_callbacks);
5690 scoped_refptr<media::AudioOutputDevice> device = 5690 scoped_refptr<media::AudioOutputDevice> device =
5691 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), 5691 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(),
5692 security_origin); 5692 security_origin);
5693 media::OutputDeviceStatus status = device->GetDeviceStatus(); 5693 media::OutputDeviceStatus status = device->GetDeviceStatus();
5694 device->Stop(); 5694 device->Stop();
5695 callback.Run(status); 5695 callback.Run(status);
5696 } 5696 }
5697 5697
5698 } // namespace content 5698 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/service_worker/service_worker_context_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698