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 #include "webkit/support/webkit_support.h" | 5 #include "webkit/support/webkit_support.h" |
6 | 6 |
7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
8 #include "base/base64.h" | 8 #include "base/base64.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "base/string_piece.h" | 23 #include "base/string_piece.h" |
24 #include "base/string_util.h" | 24 #include "base/string_util.h" |
25 #include "base/stringprintf.h" | 25 #include "base/stringprintf.h" |
26 #include "base/sys_string_conversions.h" | 26 #include "base/sys_string_conversions.h" |
27 #include "base/time.h" | 27 #include "base/time.h" |
28 #include "base/utf_string_conversions.h" | 28 #include "base/utf_string_conversions.h" |
29 #include "googleurl/src/url_util.h" | 29 #include "googleurl/src/url_util.h" |
30 #include "grit/webkit_chromium_resources.h" | 30 #include "grit/webkit_chromium_resources.h" |
31 #include "media/base/filter_collection.h" | 31 #include "media/base/filter_collection.h" |
32 #include "media/base/media_log.h" | 32 #include "media/base/media_log.h" |
33 #include "media/base/message_loop_factory_impl.h" | 33 #include "media/base/message_loop_factory.h" |
34 #include "net/base/escape.h" | 34 #include "net/base/escape.h" |
35 #include "net/base/net_errors.h" | 35 #include "net/base/net_errors.h" |
36 #include "net/base/net_util.h" | 36 #include "net/base/net_util.h" |
37 #include "testing/gtest/include/gtest/gtest.h" | 37 #include "testing/gtest/include/gtest/gtest.h" |
38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback
s.h" | 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback
s.h" |
39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" | 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" |
41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h
" | 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h
" |
42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
43 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.
h" | 43 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.
h" |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 | 318 |
319 WebKit::WebMediaPlayer* CreateMediaPlayer( | 319 WebKit::WebMediaPlayer* CreateMediaPlayer( |
320 WebFrame* frame, | 320 WebFrame* frame, |
321 WebMediaPlayerClient* client, | 321 WebMediaPlayerClient* client, |
322 webkit_media::MediaStreamClient* media_stream_client) { | 322 webkit_media::MediaStreamClient* media_stream_client) { |
323 #if defined(OS_ANDROID) | 323 #if defined(OS_ANDROID) |
324 // TODO: Implement the WebMediaPlayer that will be used for Android. | 324 // TODO: Implement the WebMediaPlayer that will be used for Android. |
325 return NULL; | 325 return NULL; |
326 #else | 326 #else |
327 scoped_ptr<media::MessageLoopFactory> message_loop_factory( | 327 scoped_ptr<media::MessageLoopFactory> message_loop_factory( |
328 new media::MessageLoopFactoryImpl()); | 328 new media::MessageLoopFactory()); |
329 | 329 |
330 scoped_ptr<media::FilterCollection> collection( | 330 scoped_ptr<media::FilterCollection> collection( |
331 new media::FilterCollection()); | 331 new media::FilterCollection()); |
332 | 332 |
333 return new webkit_media::WebMediaPlayerImpl( | 333 return new webkit_media::WebMediaPlayerImpl( |
334 frame, | 334 frame, |
335 client, | 335 client, |
336 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), | 336 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), |
337 collection.release(), | 337 collection.release(), |
338 NULL, | 338 NULL, |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
694 // Logging | 694 // Logging |
695 void EnableWebCoreLogChannels(const std::string& channels) { | 695 void EnableWebCoreLogChannels(const std::string& channels) { |
696 webkit_glue::EnableWebCoreLogChannels(channels); | 696 webkit_glue::EnableWebCoreLogChannels(channels); |
697 } | 697 } |
698 | 698 |
699 void SetGamepadData(const WebKit::WebGamepads& pads) { | 699 void SetGamepadData(const WebKit::WebGamepads& pads) { |
700 test_environment->webkit_platform_support()->setGamepadData(pads); | 700 test_environment->webkit_platform_support()->setGamepadData(pads); |
701 } | 701 } |
702 | 702 |
703 } // namespace webkit_support | 703 } // namespace webkit_support |
OLD | NEW |