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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 985643004: Make ContentRendererClient::DidCreateScriptContext take a WebLocalFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: namespace Created 5 years, 9 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/chrome_content_renderer_client.h ('k') | content/public/renderer/content_renderer_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index f7a40cbb8cefedb334b2c08be6c4c81d8ebc5904..e241fe6cbe630c3f5401090c732a4966f9bd3c48 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -163,8 +163,6 @@ using blink::WebCache;
using blink::WebConsoleMessage;
using blink::WebDataSource;
using blink::WebDocument;
-using blink::WebFrame;
-using blink::WebLocalFrame;
using blink::WebPlugin;
using blink::WebPluginParams;
using blink::WebSecurityOrigin;
@@ -633,7 +631,7 @@ ChromeContentRendererClient::CreatePluginPlaceholder(
bool ChromeContentRendererClient::OverrideCreatePlugin(
content::RenderFrame* render_frame,
- WebLocalFrame* frame,
+ blink::WebLocalFrame* frame,
const WebPluginParams& params,
WebPlugin** plugin) {
std::string orig_mime_type = params.mimeType.utf8();
@@ -690,7 +688,7 @@ void ChromeContentRendererClient::DeferMediaLoad(
WebPlugin* ChromeContentRendererClient::CreatePlugin(
content::RenderFrame* render_frame,
- WebLocalFrame* frame,
+ blink::WebLocalFrame* frame,
const WebPluginParams& original_params,
const ChromeViewHostMsg_GetPluginInfo_Output& output) {
const ChromeViewHostMsg_GetPluginInfo_Status& status = output.status;
@@ -1242,7 +1240,7 @@ bool ChromeContentRendererClient::AllowPopup() {
return false;
}
-bool ChromeContentRendererClient::ShouldFork(WebFrame* frame,
+bool ChromeContentRendererClient::ShouldFork(blink::WebFrame* frame,
const GURL& url,
const std::string& http_method,
bool is_initial_navigation,
@@ -1384,7 +1382,9 @@ bool ChromeContentRendererClient::WillSendRequest(
}
void ChromeContentRendererClient::DidCreateScriptContext(
- WebFrame* frame, v8::Handle<v8::Context> context, int extension_group,
+ blink::WebLocalFrame* frame,
+ v8::Handle<v8::Context> context,
+ int extension_group,
int world_id) {
#if defined(ENABLE_EXTENSIONS)
extension_dispatcher_->DidCreateScriptContext(
@@ -1431,7 +1431,7 @@ ChromeContentRendererClient::GetExtensionDispatcherForTest() {
}
bool ChromeContentRendererClient::CrossesExtensionExtents(
- WebFrame* frame,
+ blink::WebFrame* frame,
const GURL& new_url,
const extensions::ExtensionSet& extensions,
bool is_extension_url,
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.h ('k') | content/public/renderer/content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698