OLD | NEW |
---|---|
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 15 matching lines...) Expand all Loading... | |
26 #include "components/view_manager/public/cpp/view_manager.h" | 26 #include "components/view_manager/public/cpp/view_manager.h" |
27 #include "components/view_manager/public/interfaces/surfaces.mojom.h" | 27 #include "components/view_manager/public/interfaces/surfaces.mojom.h" |
28 #include "mandoline/services/navigation/public/interfaces/navigation.mojom.h" | 28 #include "mandoline/services/navigation/public/interfaces/navigation.mojom.h" |
29 #include "mojo/application/public/cpp/application_impl.h" | 29 #include "mojo/application/public/cpp/application_impl.h" |
30 #include "mojo/application/public/cpp/connect.h" | 30 #include "mojo/application/public/cpp/connect.h" |
31 #include "mojo/application/public/interfaces/shell.mojom.h" | 31 #include "mojo/application/public/interfaces/shell.mojom.h" |
32 #include "mojo/converters/geometry/geometry_type_converters.h" | 32 #include "mojo/converters/geometry/geometry_type_converters.h" |
33 #include "skia/ext/refptr.h" | 33 #include "skia/ext/refptr.h" |
34 #include "third_party/WebKit/public/platform/Platform.h" | 34 #include "third_party/WebKit/public/platform/Platform.h" |
35 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" | 35 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" |
36 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" | 36 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" |
ddorwin
2015/07/14 18:25:10
Remove now, right?
Srirama
2015/07/15 06:14:24
Done.
| |
37 #include "third_party/WebKit/public/platform/WebSize.h" | 37 #include "third_party/WebKit/public/platform/WebSize.h" |
38 #include "third_party/WebKit/public/web/WebConsoleMessage.h" | 38 #include "third_party/WebKit/public/web/WebConsoleMessage.h" |
39 #include "third_party/WebKit/public/web/WebDocument.h" | 39 #include "third_party/WebKit/public/web/WebDocument.h" |
40 #include "third_party/WebKit/public/web/WebElement.h" | 40 #include "third_party/WebKit/public/web/WebElement.h" |
41 #include "third_party/WebKit/public/web/WebFrameWidget.h" | 41 #include "third_party/WebKit/public/web/WebFrameWidget.h" |
42 #include "third_party/WebKit/public/web/WebInputEvent.h" | 42 #include "third_party/WebKit/public/web/WebInputEvent.h" |
43 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 43 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
44 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" | 44 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" |
45 #include "third_party/WebKit/public/web/WebRemoteFrame.h" | 45 #include "third_party/WebKit/public/web/WebRemoteFrame.h" |
46 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h" | 46 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h" |
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
377 } | 377 } |
378 | 378 |
379 blink::WebStorageNamespace* Frame::createSessionStorageNamespace() { | 379 blink::WebStorageNamespace* Frame::createSessionStorageNamespace() { |
380 return new WebStorageNamespaceImpl(); | 380 return new WebStorageNamespaceImpl(); |
381 } | 381 } |
382 | 382 |
383 blink::WebMediaPlayer* Frame::createMediaPlayer( | 383 blink::WebMediaPlayer* Frame::createMediaPlayer( |
384 blink::WebLocalFrame* frame, | 384 blink::WebLocalFrame* frame, |
385 const blink::WebURL& url, | 385 const blink::WebURL& url, |
386 blink::WebMediaPlayerClient* client, | 386 blink::WebMediaPlayerClient* client, |
387 blink::WebContentDecryptionModule* initial_cdm) { | |
388 return createMediaPlayer(frame, url, client, client, initial_cdm); | |
389 } | |
390 | |
391 blink::WebMediaPlayer* Frame::createMediaPlayer( | |
392 blink::WebLocalFrame* frame, | |
393 const blink::WebURL& url, | |
394 blink::WebMediaPlayerClient* client, | |
395 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, | 387 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, |
396 blink::WebContentDecryptionModule* initial_cdm) { | 388 blink::WebContentDecryptionModule* initial_cdm) { |
397 return global_state()->media_factory()->CreateMediaPlayer( | 389 return global_state()->media_factory()->CreateMediaPlayer( |
398 frame, url, client, encrypted_client, initial_cdm, | 390 frame, url, client, encrypted_client, initial_cdm, |
399 frame_tree_manager_->app()->shell()); | 391 frame_tree_manager_->app()->shell()); |
400 } | 392 } |
401 | 393 |
402 blink::WebFrame* Frame::createChildFrame(blink::WebLocalFrame* parent, | 394 blink::WebFrame* Frame::createChildFrame(blink::WebLocalFrame* parent, |
403 blink::WebTreeScopeType scope, | 395 blink::WebTreeScopeType scope, |
404 const blink::WebString& frame_name, | 396 const blink::WebString& frame_name, |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
512 | 504 |
513 void Frame::reload(bool ignore_cache, bool is_client_redirect) { | 505 void Frame::reload(bool ignore_cache, bool is_client_redirect) { |
514 NOTIMPLEMENTED(); | 506 NOTIMPLEMENTED(); |
515 } | 507 } |
516 | 508 |
517 void Frame::forwardInputEvent(const blink::WebInputEvent* event) { | 509 void Frame::forwardInputEvent(const blink::WebInputEvent* event) { |
518 NOTIMPLEMENTED(); | 510 NOTIMPLEMENTED(); |
519 } | 511 } |
520 | 512 |
521 } // namespace mojo | 513 } // namespace mojo |
OLD | NEW |