Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1240)

Side by Side Diff: content/renderer/renderer_blink_platform_impl.cc

Issue 1476873002: Adding <keygen> Content Setting (Final) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Using top-level dURL. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 840
841 blink::WebPublicSuffixList* RendererBlinkPlatformImpl::publicSuffixList() { 841 blink::WebPublicSuffixList* RendererBlinkPlatformImpl::publicSuffixList() {
842 return &public_suffix_list_; 842 return &public_suffix_list_;
843 } 843 }
844 844
845 //------------------------------------------------------------------------------ 845 //------------------------------------------------------------------------------
846 846
847 blink::WebString RendererBlinkPlatformImpl::signedPublicKeyAndChallengeString( 847 blink::WebString RendererBlinkPlatformImpl::signedPublicKeyAndChallengeString(
848 unsigned key_size_index, 848 unsigned key_size_index,
849 const blink::WebString& challenge, 849 const blink::WebString& challenge,
850 const blink::WebURL& url) { 850 const blink::WebURL& url,
851 const blink::WebURL& parent_url) {
851 std::string signed_public_key; 852 std::string signed_public_key;
852 RenderThread::Get()->Send(new RenderProcessHostMsg_Keygen( 853 RenderThread::Get()->Send(new RenderProcessHostMsg_Keygen(
853 static_cast<uint32>(key_size_index), 854 static_cast<uint32>(key_size_index),
854 challenge.utf8(), 855 challenge.utf8(),
855 GURL(url), 856 GURL(url),
857 GURL(parent_url),
856 &signed_public_key)); 858 &signed_public_key));
857 return WebString::fromUTF8(signed_public_key); 859 return WebString::fromUTF8(signed_public_key);
858 } 860 }
859 861
860 //------------------------------------------------------------------------------ 862 //------------------------------------------------------------------------------
861 863
862 void RendererBlinkPlatformImpl::screenColorProfile( 864 void RendererBlinkPlatformImpl::screenColorProfile(
863 WebVector<char>* to_profile) { 865 WebVector<char>* to_profile) {
864 #if defined(OS_WIN) 866 #if defined(OS_WIN)
865 // On Windows screen color profile is only available in the browser. 867 // On Windows screen color profile is only available in the browser.
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
1313 //------------------------------------------------------------------------------ 1315 //------------------------------------------------------------------------------
1314 1316
1315 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting( 1317 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting(
1316 const blink::WebBatteryStatus& status) { 1318 const blink::WebBatteryStatus& status) {
1317 if (!g_test_battery_status_listener) 1319 if (!g_test_battery_status_listener)
1318 return; 1320 return;
1319 g_test_battery_status_listener->updateBatteryStatus(status); 1321 g_test_battery_status_listener->updateBatteryStatus(status);
1320 } 1322 }
1321 1323
1322 } // namespace content 1324 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698