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

Unified Diff: components/html_viewer/media_factory.h

Issue 1677293002: Bye bye Mandoline (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moar 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_main.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
deleted file mode 100644
index 8ee29ea3455e794fa383d546a695106ecdbcfaf3..0000000000000000000000000000000000000000
--- a/components/html_viewer/media_factory.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef COMPONENTS_HTML_VIEWER_MEDIA_FACTORY_H_
-#define COMPONENTS_HTML_VIEWER_MEDIA_FACTORY_H_
-
-#include "base/macros.h"
-#include "base/memory/linked_ptr.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/threading/thread.h"
-#include "build/build_config.h"
-#include "media/audio/fake_audio_log_factory.h"
-#include "media/base/audio_hardware_config.h"
-#include "media/blink/url_index.h"
-#include "media/mojo/interfaces/service_factory.mojom.h"
-#include "mojo/shell/public/interfaces/service_provider.mojom.h"
-
-namespace base {
-class SingleThreadTaskRunner;
-}
-
-namespace blink {
-class WebContentDecryptionModule;
-class WebEncryptedMediaClient;
-class WebMediaPlayer;
-class WebLocalFrame;
-class WebURL;
-class WebMediaPlayerClient;
-class WebMediaPlayerEncryptedMediaClient;
-}
-
-namespace media {
-class AudioManager;
-class RestartableAudioRendererSink;
-class CdmFactory;
-class MediaPermission;
-class UrlIndex;
-class WebEncryptedMediaClientImpl;
-}
-
-namespace mojo {
-class Shell;
-}
-
-namespace html_viewer {
-
-// Helper class used to create blink::WebMediaPlayer objects.
-// This class stores the "global state" shared across all WebMediaPlayer
-// instances.
-class MediaFactory {
- public:
- MediaFactory(
- const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
- mojo::Shell* shell);
- ~MediaFactory();
-
- blink::WebMediaPlayer* CreateMediaPlayer(
- blink::WebLocalFrame* frame,
- const blink::WebURL& url,
- blink::WebMediaPlayerClient* client,
- blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
- blink::WebContentDecryptionModule* initial_cdm,
- mojo::Shell* shell);
-
- blink::WebEncryptedMediaClient* GetEncryptedMediaClient();
-
- private:
- media::interfaces::ServiceFactory* GetMediaServiceFactory();
- media::MediaPermission* GetMediaPermission();
- media::CdmFactory* GetCdmFactory();
-
-#if !defined(OS_ANDROID)
- const media::AudioHardwareConfig& GetAudioHardwareConfig();
- scoped_refptr<media::RestartableAudioRendererSink> CreateAudioRendererSink();
- scoped_refptr<base::SingleThreadTaskRunner> GetMediaThreadTaskRunner();
-
- base::Thread media_thread_;
- media::FakeAudioLogFactory fake_audio_log_factory_;
- scoped_ptr<media::AudioManager> audio_manager_;
- media::AudioHardwareConfig audio_hardware_config_;
-#endif
-
- const bool enable_mojo_media_renderer_;
- scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
- mojo::Shell* shell_;
-
- // Lazily initialized objects.
- media::interfaces::ServiceFactoryPtr media_service_factory_;
- scoped_ptr<media::WebEncryptedMediaClientImpl> web_encrypted_media_client_;
- scoped_ptr<media::MediaPermission> media_permission_;
- scoped_ptr<media::CdmFactory> cdm_factory_;
-
- // Media resource cache, lazily initialized.
- linked_ptr<media::UrlIndex> url_index_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaFactory);
-};
-
-} // namespace html_viewer
-
-#endif // COMPONENTS_HTML_VIEWER_MEDIA_FACTORY_H_
« no previous file with comments | « components/html_viewer/layout_test_html_viewer_main.cc ('k') | components/html_viewer/media_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698