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

Side by Side Diff: components/html_viewer/frame.cc

Issue 1133033003: Eliminate MediaPlayer & MediaPlayerClient abstractions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add new path for createMediaPlayer() Created 5 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "components/html_viewer/frame.h" 5 #include "components/html_viewer/frame.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 } 376 }
377 377
378 blink::WebStorageNamespace* Frame::createSessionStorageNamespace() { 378 blink::WebStorageNamespace* Frame::createSessionStorageNamespace() {
379 return new WebStorageNamespaceImpl(); 379 return new WebStorageNamespaceImpl();
380 } 380 }
381 381
382 blink::WebMediaPlayer* Frame::createMediaPlayer( 382 blink::WebMediaPlayer* Frame::createMediaPlayer(
383 blink::WebLocalFrame* frame, 383 blink::WebLocalFrame* frame,
384 const blink::WebURL& url, 384 const blink::WebURL& url,
385 blink::WebMediaPlayerClient* client, 385 blink::WebMediaPlayerClient* client,
386 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
386 blink::WebContentDecryptionModule* initial_cdm) { 387 blink::WebContentDecryptionModule* initial_cdm) {
387 return global_state()->media_factory()->CreateMediaPlayer( 388 return global_state()->media_factory()->CreateMediaPlayer(
388 frame, url, client, initial_cdm, frame_tree_manager_->app()->shell()); 389 frame, url, client, encrypted_client, initial_cdm,
390 frame_tree_manager_->app()->shell());
389 } 391 }
390 392
391 blink::WebFrame* Frame::createChildFrame(blink::WebLocalFrame* parent, 393 blink::WebFrame* Frame::createChildFrame(blink::WebLocalFrame* parent,
392 blink::WebTreeScopeType scope, 394 blink::WebTreeScopeType scope,
393 const blink::WebString& frame_name, 395 const blink::WebString& frame_name,
394 blink::WebSandboxFlags sandbox_flags) { 396 blink::WebSandboxFlags sandbox_flags) {
395 DCHECK(IsLocal()); // Can't create children of remote frames. 397 DCHECK(IsLocal()); // Can't create children of remote frames.
396 DCHECK_EQ(parent, web_frame_); 398 DCHECK_EQ(parent, web_frame_);
397 DCHECK(view_); // If we're local we have to have a view. 399 DCHECK(view_); // If we're local we have to have a view.
398 // Create the view that will house the frame now. We embed once we know the 400 // Create the view that will house the frame now. We embed once we know the
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 503
502 void Frame::reload(bool ignore_cache, bool is_client_redirect) { 504 void Frame::reload(bool ignore_cache, bool is_client_redirect) {
503 NOTIMPLEMENTED(); 505 NOTIMPLEMENTED();
504 } 506 }
505 507
506 void Frame::forwardInputEvent(const blink::WebInputEvent* event) { 508 void Frame::forwardInputEvent(const blink::WebInputEvent* event) {
507 NOTIMPLEMENTED(); 509 NOTIMPLEMENTED();
508 } 510 }
509 511
510 } // namespace mojo 512 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698