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

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

Issue 6928021: Make ViewHostMsg_Keygen a routed ipc (part 1/2). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 months 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view.h ('k') | content/renderer/renderer_webkitclient_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/render_view.h" 5 #include "content/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 2778 matching lines...) Expand 10 before | Expand all | Expand 10 after
2789 WebSecurityOrigin origin = frame->securityOrigin(); 2789 WebSecurityOrigin origin = frame->securityOrigin();
2790 if (origin.isEmpty()) { 2790 if (origin.isEmpty()) {
2791 // Uninitialized document? 2791 // Uninitialized document?
2792 callbacks->didFail(WebKit::WebStorageQuotaErrorAbort); 2792 callbacks->didFail(WebKit::WebStorageQuotaErrorAbort);
2793 return; 2793 return;
2794 } 2794 }
2795 ChildThread::current()->quota_dispatcher()->RequestStorageQuota( 2795 ChildThread::current()->quota_dispatcher()->RequestStorageQuota(
2796 GURL(origin.toString()), type, requested_size, callbacks); 2796 GURL(origin.toString()), type, requested_size, callbacks);
2797 } 2797 }
2798 2798
2799 WebKit::WebString RenderView::signedPublicKeyAndChallengeString(
2800 unsigned key_size_index,
2801 const WebKit::WebString& challenge,
jam 2011/05/06 03:20:09 nit: drop the WebKit:: here and below
2802 const WebKit::WebURL& url) {
2803 std::string signed_public_key;
2804 Send(new ViewHostMsg_Keygen(
2805 routing_id_,
2806 static_cast<uint32>(key_size_index),
2807 challenge.utf8(),
2808 GURL(url),
2809 &signed_public_key));
2810 return WebString::fromUTF8(signed_public_key);
2811 }
2812
2799 // webkit_glue::WebPluginPageDelegate ----------------------------------------- 2813 // webkit_glue::WebPluginPageDelegate -----------------------------------------
2800 2814
2801 webkit::npapi::WebPluginDelegate* RenderView::CreatePluginDelegate( 2815 webkit::npapi::WebPluginDelegate* RenderView::CreatePluginDelegate(
2802 const FilePath& file_path, 2816 const FilePath& file_path,
2803 const std::string& mime_type) { 2817 const std::string& mime_type) {
2804 if (!PluginChannelHost::IsListening()) 2818 if (!PluginChannelHost::IsListening())
2805 return NULL; 2819 return NULL;
2806 2820
2807 bool in_process_plugin = RenderProcess::current()->UseInProcessPlugins(); 2821 bool in_process_plugin = RenderProcess::current()->UseInProcessPlugins();
2808 if (in_process_plugin) { 2822 if (in_process_plugin) {
(...skipping 1294 matching lines...) Expand 10 before | Expand all | Expand 10 after
4103 const webkit_glue::CustomContextMenuContext& custom_context) { 4117 const webkit_glue::CustomContextMenuContext& custom_context) {
4104 if (custom_context.is_pepper_menu) 4118 if (custom_context.is_pepper_menu)
4105 pepper_delegate_.OnContextMenuClosed(custom_context); 4119 pepper_delegate_.OnContextMenuClosed(custom_context);
4106 else 4120 else
4107 context_menu_node_.reset(); 4121 context_menu_node_.reset();
4108 } 4122 }
4109 4123
4110 void RenderView::OnNetworkStateChanged(bool online) { 4124 void RenderView::OnNetworkStateChanged(bool online) {
4111 WebNetworkStateNotifier::setOnLine(online); 4125 WebNetworkStateNotifier::setOnLine(online);
4112 } 4126 }
OLDNEW
« no previous file with comments | « content/renderer/render_view.h ('k') | content/renderer/renderer_webkitclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698