content/shell/renderer/shell_content_renderer_client.h - Issue 18590002: Migrate MediaStream test code from content/shell/renderer/ to content/test/.

Side by Side Diff: content/shell/renderer/shell_content_renderer_client.h

Issue 18590002: Migrate MediaStream test code from content/shell/renderer/ to content/test/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 5 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 | Annotate | Revision Log

« content/public/renderer/video_frame_provider.h ('K') | « content/renderer/renderer_webkitplatformsupport_impl.cc ('k') | content/shell/renderer/shell_content_renderer_client.cc » ('j') | content/shell/renderer/shell_media_stream_client.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_	5 #ifndef CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_

6 #define CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_	6 #define CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_

7	7

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

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

10 #include "base/platform_file.h"	10 #include "base/platform_file.h"

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 virtual bool OverrideCreatePlugin(	46 virtual bool OverrideCreatePlugin(

47 RenderView* render_view,	47 RenderView* render_view,

48 WebKit::WebFrame* frame,	48 WebKit::WebFrame* frame,

49 const WebKit::WebPluginParams& params,	49 const WebKit::WebPluginParams& params,

50 WebKit::WebPlugin** plugin) OVERRIDE;	50 WebKit::WebPlugin** plugin) OVERRIDE;

51 virtual WebKit::WebMediaStreamCenter* OverrideCreateWebMediaStreamCenter(	51 virtual WebKit::WebMediaStreamCenter* OverrideCreateWebMediaStreamCenter(

52 WebKit::WebMediaStreamCenterClient* client) OVERRIDE;	52 WebKit::WebMediaStreamCenterClient* client) OVERRIDE;

53 virtual WebKit::WebRTCPeerConnectionHandler*	53 virtual WebKit::WebRTCPeerConnectionHandler*

54 OverrideCreateWebRTCPeerConnectionHandler(	54 OverrideCreateWebRTCPeerConnectionHandler(

55 WebKit::WebRTCPeerConnectionHandlerClient* client) OVERRIDE;	55 WebKit::WebRTCPeerConnectionHandlerClient* client) OVERRIDE;

56 virtual webkit_media::MediaStreamClient* OverrideCreateMediaStreamClient()	56 virtual MediaStreamClient* OverrideCreateMediaStreamClient() OVERRIDE;

57 OVERRIDE;

58 virtual WebKit::WebMIDIAccessor* OverrideCreateMIDIAccessor(	57 virtual WebKit::WebMIDIAccessor* OverrideCreateMIDIAccessor(

59 WebKit::WebMIDIAccessorClient* client) OVERRIDE;	58 WebKit::WebMIDIAccessorClient* client) OVERRIDE;

60 virtual WebKit::WebClipboard* OverrideWebClipboard() OVERRIDE;	59 virtual WebKit::WebClipboard* OverrideWebClipboard() OVERRIDE;

61 virtual WebKit::WebHyphenator* OverrideWebHyphenator() OVERRIDE;	60 virtual WebKit::WebHyphenator* OverrideWebHyphenator() OVERRIDE;

62 virtual WebKit::WebThemeEngine* OverrideThemeEngine() OVERRIDE;	61 virtual WebKit::WebThemeEngine* OverrideThemeEngine() OVERRIDE;

63 virtual bool AllowBrowserPlugin(	62 virtual bool AllowBrowserPlugin(

64 WebKit::WebPluginContainer* container) const OVERRIDE;	63 WebKit::WebPluginContainer* container) const OVERRIDE;

65	64

66 private:	65 private:

67 void WebTestProxyCreated(RenderView* render_view,	66 void WebTestProxyCreated(RenderView* render_view,

68 WebTestRunner::WebTestProxyBase* proxy);	67 WebTestRunner::WebTestProxyBase* proxy);

69	68

70 scoped_ptr<ShellMediaStreamClient> shell_media_stream_client_;	69 scoped_ptr<ShellMediaStreamClient> shell_media_stream_client_;

71 scoped_ptr<ShellRenderProcessObserver> shell_observer_;	70 scoped_ptr<ShellRenderProcessObserver> shell_observer_;

72 scoped_ptr<MockWebClipboardImpl> clipboard_;	71 scoped_ptr<MockWebClipboardImpl> clipboard_;

73 scoped_ptr<webkit_glue::MockWebHyphenator> hyphenator_;	72 scoped_ptr<webkit_glue::MockWebHyphenator> hyphenator_;

74 };	73 };

75	74

76 } // namespace content	75 } // namespace content

77	76

78 #endif // CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_	77 #endif // CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_

OLD	NEW