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 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
734 WebKit::WebURLError CreateCancelledError(const WebKit::WebURLRequest& request) { | 734 WebKit::WebURLError CreateCancelledError(const WebKit::WebURLRequest& request) { |
735 WebKit::WebURLError error; | 735 WebKit::WebURLError error; |
736 error.domain = WebKit::WebString::fromUTF8(net::kErrorDomain); | 736 error.domain = WebKit::WebString::fromUTF8(net::kErrorDomain); |
737 error.reason = net::ERR_ABORTED; | 737 error.reason = net::ERR_ABORTED; |
738 error.unreachableURL = request.url(); | 738 error.unreachableURL = request.url(); |
739 return error; | 739 return error; |
740 } | 740 } |
741 | 741 |
742 WebKit::WebURLRequest::ExtraData* CreateWebURLRequestExtraData( | 742 WebKit::WebURLRequest::ExtraData* CreateWebURLRequestExtraData( |
743 WebKit::WebReferrerPolicy referrer_policy) { | 743 WebKit::WebReferrerPolicy referrer_policy) { |
744 return new webkit_glue::WebURLRequestExtraDataImpl(referrer_policy); | 744 return new webkit_glue::WebURLRequestExtraDataImpl(referrer_policy, |
| 745 WebKit::WebString()); |
745 } | 746 } |
746 | 747 |
747 // Bridge for SimpleDatabaseSystem | 748 // Bridge for SimpleDatabaseSystem |
748 | 749 |
749 void SetDatabaseQuota(int quota) { | 750 void SetDatabaseQuota(int quota) { |
750 SimpleDatabaseSystem::GetInstance()->SetDatabaseQuota(quota); | 751 SimpleDatabaseSystem::GetInstance()->SetDatabaseQuota(quota); |
751 } | 752 } |
752 | 753 |
753 void ClearAllDatabases() { | 754 void ClearAllDatabases() { |
754 SimpleDatabaseSystem::GetInstance()->ClearAllDatabases(); | 755 SimpleDatabaseSystem::GetInstance()->ClearAllDatabases(); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
823 // Logging | 824 // Logging |
824 void EnableWebCoreLogChannels(const std::string& channels) { | 825 void EnableWebCoreLogChannels(const std::string& channels) { |
825 webkit_glue::EnableWebCoreLogChannels(channels); | 826 webkit_glue::EnableWebCoreLogChannels(channels); |
826 } | 827 } |
827 | 828 |
828 void SetGamepadData(const WebKit::WebGamepads& pads) { | 829 void SetGamepadData(const WebKit::WebGamepads& pads) { |
829 test_environment->webkit_platform_support()->setGamepadData(pads); | 830 test_environment->webkit_platform_support()->setGamepadData(pads); |
830 } | 831 } |
831 | 832 |
832 } // namespace webkit_support | 833 } // namespace webkit_support |
OLD | NEW |