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 804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
815 | 815 |
816 blink::WebPublicSuffixList* RendererBlinkPlatformImpl::publicSuffixList() { | 816 blink::WebPublicSuffixList* RendererBlinkPlatformImpl::publicSuffixList() { |
817 return &public_suffix_list_; | 817 return &public_suffix_list_; |
818 } | 818 } |
819 | 819 |
820 //------------------------------------------------------------------------------ | 820 //------------------------------------------------------------------------------ |
821 | 821 |
822 blink::WebString RendererBlinkPlatformImpl::signedPublicKeyAndChallengeString( | 822 blink::WebString RendererBlinkPlatformImpl::signedPublicKeyAndChallengeString( |
823 unsigned key_size_index, | 823 unsigned key_size_index, |
824 const blink::WebString& challenge, | 824 const blink::WebString& challenge, |
825 const blink::WebURL& url) { | 825 const blink::WebURL& url, |
826 const blink::WebURL& top_url) { | |
nasko
2016/01/11 22:25:47
This is no longer an URL, but an origin. Can you p
svaldez
2016/01/12 13:53:38
Done.
| |
826 std::string signed_public_key; | 827 std::string signed_public_key; |
827 RenderThread::Get()->Send(new RenderProcessHostMsg_Keygen( | 828 RenderThread::Get()->Send(new RenderProcessHostMsg_Keygen( |
828 static_cast<uint32_t>(key_size_index), challenge.utf8(), GURL(url), | 829 static_cast<uint32_t>(key_size_index), challenge.utf8(), GURL(url), |
829 &signed_public_key)); | 830 GURL(top_url), &signed_public_key)); |
830 return WebString::fromUTF8(signed_public_key); | 831 return WebString::fromUTF8(signed_public_key); |
831 } | 832 } |
832 | 833 |
833 //------------------------------------------------------------------------------ | 834 //------------------------------------------------------------------------------ |
834 | 835 |
835 void RendererBlinkPlatformImpl::screenColorProfile( | 836 void RendererBlinkPlatformImpl::screenColorProfile( |
836 WebVector<char>* to_profile) { | 837 WebVector<char>* to_profile) { |
837 #if defined(OS_WIN) | 838 #if defined(OS_WIN) |
838 // On Windows screen color profile is only available in the browser. | 839 // On Windows screen color profile is only available in the browser. |
839 std::vector<char> profile; | 840 std::vector<char> profile; |
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1288 //------------------------------------------------------------------------------ | 1289 //------------------------------------------------------------------------------ |
1289 | 1290 |
1290 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting( | 1291 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting( |
1291 const blink::WebBatteryStatus& status) { | 1292 const blink::WebBatteryStatus& status) { |
1292 if (!g_test_battery_status_listener) | 1293 if (!g_test_battery_status_listener) |
1293 return; | 1294 return; |
1294 g_test_battery_status_listener->updateBatteryStatus(status); | 1295 g_test_battery_status_listener->updateBatteryStatus(status); |
1295 } | 1296 } |
1296 | 1297 |
1297 } // namespace content | 1298 } // namespace content |
OLD | NEW |