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

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

Issue 1370453002: Introduce WebMediaSession (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert throwing in the constructor; would needlessly complicate existing tests Created 5 years, 2 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 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 373
374 // blink::WebFrameClient implementation: 374 // blink::WebFrameClient implementation:
375 blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame, 375 blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame,
376 const blink::WebPluginParams& params) override; 376 const blink::WebPluginParams& params) override;
377 blink::WebMediaPlayer* createMediaPlayer( 377 blink::WebMediaPlayer* createMediaPlayer(
378 blink::WebLocalFrame* frame, 378 blink::WebLocalFrame* frame,
379 const blink::WebURL& url, 379 const blink::WebURL& url,
380 blink::WebMediaPlayerClient* client, 380 blink::WebMediaPlayerClient* client,
381 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, 381 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
382 blink::WebContentDecryptionModule* initial_cdm) override; 382 blink::WebContentDecryptionModule* initial_cdm) override;
383 blink::WebMediaSession* createMediaSession(
384 blink::WebLocalFrame* frame) override;
383 blink::WebApplicationCacheHost* createApplicationCacheHost( 385 blink::WebApplicationCacheHost* createApplicationCacheHost(
384 blink::WebLocalFrame* frame, 386 blink::WebLocalFrame* frame,
385 blink::WebApplicationCacheHostClient* client) override; 387 blink::WebApplicationCacheHostClient* client) override;
386 blink::WebWorkerContentSettingsClientProxy* 388 blink::WebWorkerContentSettingsClientProxy*
387 createWorkerContentSettingsClientProxy(blink::WebLocalFrame* frame) override; 389 createWorkerContentSettingsClientProxy(blink::WebLocalFrame* frame) override;
388 blink::WebExternalPopupMenu* createExternalPopupMenu( 390 blink::WebExternalPopupMenu* createExternalPopupMenu(
389 const blink::WebPopupMenuInfo& popup_menu_info, 391 const blink::WebPopupMenuInfo& popup_menu_info,
390 blink::WebExternalPopupMenuClient* popup_menu_client) override; 392 blink::WebExternalPopupMenuClient* popup_menu_client) override;
391 blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame) override; 393 blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame) override;
392 blink::WebServiceWorkerProvider* createServiceWorkerProvider( 394 blink::WebServiceWorkerProvider* createServiceWorkerProvider(
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 #endif 1065 #endif
1064 1066
1065 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1067 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1066 1068
1067 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1069 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1068 }; 1070 };
1069 1071
1070 } // namespace content 1072 } // namespace content
1071 1073
1072 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1074 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698