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/glue/webkitplatformsupport_impl.h" | 5 #include "webkit/glue/webkitplatformsupport_impl.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "base/rand_util.h" | 21 #include "base/rand_util.h" |
22 #include "base/string_util.h" | 22 #include "base/string_util.h" |
23 #include "base/strings/string_number_conversions.h" | 23 #include "base/strings/string_number_conversions.h" |
24 #include "base/synchronization/lock.h" | 24 #include "base/synchronization/lock.h" |
25 #include "base/sys_info.h" | 25 #include "base/sys_info.h" |
26 #include "base/time.h" | 26 #include "base/time.h" |
27 #include "base/utf_string_conversions.h" | 27 #include "base/utf_string_conversions.h" |
28 #include "grit/webkit_chromium_resources.h" | 28 #include "grit/webkit_chromium_resources.h" |
29 #include "grit/webkit_resources.h" | 29 #include "grit/webkit_resources.h" |
30 #include "grit/webkit_strings.h" | 30 #include "grit/webkit_strings.h" |
| 31 #include "net/base/net_errors.h" |
31 #include "third_party/WebKit/Source/Platform/chromium/public/WebCookie.h" | 32 #include "third_party/WebKit/Source/Platform/chromium/public/WebCookie.h" |
32 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" | 33 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" |
33 #include "third_party/WebKit/Source/Platform/chromium/public/WebDiscardableMemor
y.h" | 34 #include "third_party/WebKit/Source/Platform/chromium/public/WebDiscardableMemor
y.h" |
34 #include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" | 35 #include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" |
35 #include "third_party/WebKit/Source/Platform/chromium/public/WebPluginListBuilde
r.h" | 36 #include "third_party/WebKit/Source/Platform/chromium/public/WebPluginListBuilde
r.h" |
36 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | 37 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" |
37 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" | 38 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" |
38 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" | 39 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" |
39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" | 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" |
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
391 } | 392 } |
392 | 393 |
393 WebSocketStreamHandle* WebKitPlatformSupportImpl::createSocketStreamHandle() { | 394 WebSocketStreamHandle* WebKitPlatformSupportImpl::createSocketStreamHandle() { |
394 return new WebSocketStreamHandleImpl(this); | 395 return new WebSocketStreamHandleImpl(this); |
395 } | 396 } |
396 | 397 |
397 WebString WebKitPlatformSupportImpl::userAgent(const WebURL& url) { | 398 WebString WebKitPlatformSupportImpl::userAgent(const WebURL& url) { |
398 return WebString::fromUTF8(webkit_glue::GetUserAgent(url)); | 399 return WebString::fromUTF8(webkit_glue::GetUserAgent(url)); |
399 } | 400 } |
400 | 401 |
| 402 int WebKitPlatformSupportImpl::cancelledErrorCode() const { |
| 403 return net::ERR_ABORTED; |
| 404 } |
| 405 |
401 void WebKitPlatformSupportImpl::getPluginList(bool refresh, | 406 void WebKitPlatformSupportImpl::getPluginList(bool refresh, |
402 WebPluginListBuilder* builder) { | 407 WebPluginListBuilder* builder) { |
403 std::vector<webkit::WebPluginInfo> plugins; | 408 std::vector<webkit::WebPluginInfo> plugins; |
404 GetPlugins(refresh, &plugins); | 409 GetPlugins(refresh, &plugins); |
405 | 410 |
406 for (size_t i = 0; i < plugins.size(); ++i) { | 411 for (size_t i = 0; i < plugins.size(); ++i) { |
407 const webkit::WebPluginInfo& plugin = plugins[i]; | 412 const webkit::WebPluginInfo& plugin = plugins[i]; |
408 | 413 |
409 builder->addPlugin( | 414 builder->addPlugin( |
410 plugin.name, plugin.desc, | 415 plugin.name, plugin.desc, |
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
979 } | 984 } |
980 | 985 |
981 #if defined(OS_ANDROID) | 986 #if defined(OS_ANDROID) |
982 webkit_media::WebAudioMediaCodecRunner | 987 webkit_media::WebAudioMediaCodecRunner |
983 WebKitPlatformSupportImpl::GetWebAudioMediaCodecRunner() { | 988 WebKitPlatformSupportImpl::GetWebAudioMediaCodecRunner() { |
984 return base::Bind(&NullRunWebAudioMediaCodec); | 989 return base::Bind(&NullRunWebAudioMediaCodec); |
985 } | 990 } |
986 #endif | 991 #endif |
987 | 992 |
988 } // namespace webkit_glue | 993 } // namespace webkit_glue |
OLD | NEW |