components/html_viewer/web_media_player_factory.h - Issue 1099303002: Move html_viewer from mojo/services to components.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: components/html_viewer/web_media_player_factory.h

Issue 1099303002: Move html_viewer from mojo/services to components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 8 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 | « components/html_viewer/web_layer_tree_view_impl.cc ('k') | components/html_viewer/web_media_player_factory.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 #ifndef MOJO_SERVICES_HTML_VIEWER_WEB_MEDIA_PLAYER_FACTORY_H_	5 #ifndef COMPONENTS_HTML_VIEWER_WEB_MEDIA_PLAYER_FACTORY_H_

6 #define MOJO_SERVICES_HTML_VIEWER_WEB_MEDIA_PLAYER_FACTORY_H_	6 #define COMPONENTS_HTML_VIEWER_WEB_MEDIA_PLAYER_FACTORY_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "base/memory/ref_counted.h"	9 #include "base/memory/ref_counted.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

11 #include "base/threading/thread.h"	11 #include "base/threading/thread.h"

12 #include "media/audio/fake_audio_log_factory.h"	12 #include "media/audio/fake_audio_log_factory.h"

13 #include "media/base/audio_hardware_config.h"	13 #include "media/base/audio_hardware_config.h"

14	14

15 namespace base {	15 namespace base {

16 class SingleThreadTaskRunner;	16 class SingleThreadTaskRunner;

(...skipping 49 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66 base::Thread media_thread_;	66 base::Thread media_thread_;

67 media::FakeAudioLogFactory fake_audio_log_factory_;	67 media::FakeAudioLogFactory fake_audio_log_factory_;

68 scoped_ptr<media::AudioManager> audio_manager_;	68 scoped_ptr<media::AudioManager> audio_manager_;

69 media::AudioHardwareConfig audio_hardware_config_;	69 media::AudioHardwareConfig audio_hardware_config_;

70	70

71 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerFactory);	71 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerFactory);

72 };	72 };

73	73

74 } // namespace html_viewer	74 } // namespace html_viewer

75	75

76 #endif // MOJO_SERVICES_HTML_VIEWER_WEB_MEDIA_PLAYER_FACTORY_H_	76 #endif // COMPONENTS_HTML_VIEWER_WEB_MEDIA_PLAYER_FACTORY_H_

OLD	NEW