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

Unified Diff: chrome/renderer/render_view.cc

Issue 211013: Introduce WebKit::WebSecurityOrigin as a wrapper around... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/render_view.h ('k') | webkit/api/public/WebFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc (revision 26545)
+++ chrome/renderer/render_view.cc (working copy)
@@ -65,6 +65,7 @@
#include "webkit/api/public/WebPoint.h"
#include "webkit/api/public/WebRect.h"
#include "webkit/api/public/WebScriptSource.h"
+#include "webkit/api/public/WebSecurityOrigin.h"
#include "webkit/api/public/WebSize.h"
#include "webkit/api/public/WebURL.h"
#include "webkit/api/public/WebURLError.h"
@@ -1325,7 +1326,7 @@
view->opened_by_user_gesture_ = user_gesture;
// Record the security origin of the creator.
- GURL creator_url(creator->securityOrigin().utf8());
+ GURL creator_url(creator->securityOrigin().toString().utf8());
if (!creator_url.is_valid() || !creator_url.IsStandard())
creator_url = GURL();
view->creator_url_ = creator_url;
@@ -2230,8 +2231,8 @@
Send(new ViewHostMsg_DidLoadResourceFromMemoryCache(
routing_id_,
request.url(),
- frame->securityOrigin().utf8(),
- frame->top()->securityOrigin().utf8(),
+ frame->securityOrigin().toString().utf8(),
+ frame->top()->securityOrigin().toString().utf8(),
response.securityInfo()));
}
« no previous file with comments | « chrome/renderer/render_view.h ('k') | webkit/api/public/WebFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698