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

Unified Diff: content/renderer/render_thread.cc

Issue 7038028: Initial support for cloudprint in print preview (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bad merge 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_thread.cc
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index c9a7052570fdae88ec811fdffb5f88eb3cf3a1c5..a58459315615af568590dfb15ee924754a26a5e8 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -56,8 +56,10 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "v8/include/v8.h"
#include "webkit/extensions/v8/benchmarking_extension.h"
@@ -436,6 +438,12 @@ void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) {
params.view_id,
params.session_storage_namespace_id,
params.frame_name);
+
+ WebKit::WebSecurityPolicy::addOriginAccessWhitelistEntry(
Scott Byer 2011/05/24 23:40:32 This is going to need to be fixed up (sorry, it wa
+ GURL("chrome://print"),
+ WebKit::WebString::fromUTF8("https"),
+ WebKit::WebString::fromUTF8("www.google.com"),
+ true);
}
void RenderThread::CloseCurrentConnections() {

Powered by Google App Engine
This is Rietveld 408576698