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 "content/renderer/renderer_blink_platform_impl.h" | 5 #include "content/renderer/renderer_blink_platform_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
802 | 802 |
803 blink::WebPublicSuffixList* RendererBlinkPlatformImpl::publicSuffixList() { | 803 blink::WebPublicSuffixList* RendererBlinkPlatformImpl::publicSuffixList() { |
804 return &public_suffix_list_; | 804 return &public_suffix_list_; |
805 } | 805 } |
806 | 806 |
807 //------------------------------------------------------------------------------ | 807 //------------------------------------------------------------------------------ |
808 | 808 |
809 blink::WebString RendererBlinkPlatformImpl::signedPublicKeyAndChallengeString( | 809 blink::WebString RendererBlinkPlatformImpl::signedPublicKeyAndChallengeString( |
810 unsigned key_size_index, | 810 unsigned key_size_index, |
811 const blink::WebString& challenge, | 811 const blink::WebString& challenge, |
812 const blink::WebURL& url) { | 812 const blink::WebURL& url, |
| 813 const blink::WebURL& top_origin) { |
813 std::string signed_public_key; | 814 std::string signed_public_key; |
814 RenderThread::Get()->Send(new RenderProcessHostMsg_Keygen( | 815 RenderThread::Get()->Send(new RenderProcessHostMsg_Keygen( |
815 static_cast<uint32_t>(key_size_index), challenge.utf8(), GURL(url), | 816 static_cast<uint32_t>(key_size_index), challenge.utf8(), GURL(url), |
816 &signed_public_key)); | 817 GURL(top_origin), &signed_public_key)); |
817 return WebString::fromUTF8(signed_public_key); | 818 return WebString::fromUTF8(signed_public_key); |
818 } | 819 } |
819 | 820 |
820 //------------------------------------------------------------------------------ | 821 //------------------------------------------------------------------------------ |
821 | 822 |
822 void RendererBlinkPlatformImpl::screenColorProfile( | 823 void RendererBlinkPlatformImpl::screenColorProfile( |
823 WebVector<char>* to_profile) { | 824 WebVector<char>* to_profile) { |
824 #if defined(OS_WIN) | 825 #if defined(OS_WIN) |
825 // On Windows screen color profile is only available in the browser. | 826 // On Windows screen color profile is only available in the browser. |
826 std::vector<char> profile; | 827 std::vector<char> profile; |
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1276 //------------------------------------------------------------------------------ | 1277 //------------------------------------------------------------------------------ |
1277 | 1278 |
1278 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting( | 1279 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting( |
1279 const blink::WebBatteryStatus& status) { | 1280 const blink::WebBatteryStatus& status) { |
1280 if (!g_test_battery_status_listener) | 1281 if (!g_test_battery_status_listener) |
1281 return; | 1282 return; |
1282 g_test_battery_status_listener->updateBatteryStatus(status); | 1283 g_test_battery_status_listener->updateBatteryStatus(status); |
1283 } | 1284 } |
1284 | 1285 |
1285 } // namespace content | 1286 } // namespace content |
OLD | NEW |