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

Unified Diff: components/html_viewer/media_factory.h

Issue 1679573002: Move shell interfaces into the shell.mojom namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@delegate
Patch Set: . Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/html_viewer/layout_test_html_viewer.cc ('k') | components/html_viewer/media_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/media_factory.h
diff --git a/components/html_viewer/media_factory.h b/components/html_viewer/media_factory.h
index dc486f4f3a21a213753a713f0887e29284514de9..61a428ab307cb7c1ff92cd433c38e3b141b8f97c 100644
--- a/components/html_viewer/media_factory.h
+++ b/components/html_viewer/media_factory.h
@@ -42,8 +42,12 @@ class WebEncryptedMediaClientImpl;
namespace mojo {
class ServiceProvider;
+namespace shell {
+namespace mojom {
class Shell;
}
+}
+}
namespace html_viewer {
@@ -54,7 +58,7 @@ class MediaFactory {
public:
MediaFactory(
const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
- mojo::Shell* shell);
+ mojo::shell::mojom::Shell* shell);
~MediaFactory();
blink::WebMediaPlayer* CreateMediaPlayer(
@@ -63,7 +67,7 @@ class MediaFactory {
blink::WebMediaPlayerClient* client,
blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
blink::WebContentDecryptionModule* initial_cdm,
- mojo::Shell* shell);
+ mojo::shell::mojom::Shell* shell);
blink::WebEncryptedMediaClient* GetEncryptedMediaClient();
@@ -85,7 +89,7 @@ class MediaFactory {
const bool enable_mojo_media_renderer_;
scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
- mojo::Shell* shell_;
+ mojo::shell::mojom::Shell* shell_;
// Lazily initialized objects.
media::interfaces::ServiceFactoryPtr media_service_factory_;
« no previous file with comments | « components/html_viewer/layout_test_html_viewer.cc ('k') | components/html_viewer/media_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698