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

Unified Diff: chrome/renderer/extensions/extension_process_bindings.cc

Issue 164225: Switch to WebFrame from the WebKit API.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 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/extensions/event_bindings.cc ('k') | chrome/renderer/external_extension.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/extension_process_bindings.cc
===================================================================
--- chrome/renderer/extensions/extension_process_bindings.cc (revision 22886)
+++ chrome/renderer/extensions/extension_process_bindings.cc (working copy)
@@ -15,7 +15,7 @@
#include "chrome/renderer/render_view.h"
#include "grit/common_resources.h"
#include "grit/renderer_resources.h"
-#include "webkit/glue/webframe.h"
+#include "webkit/api/public/WebFrame.h"
using bindings_utils::GetStringResource;
using bindings_utils::ContextInfo;
@@ -82,7 +82,7 @@
static std::string ExtensionIdForCurrentContext() {
RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
DCHECK(renderview);
- GURL url = renderview->webview()->GetMainFrame()->GetURL();
+ GURL url = renderview->webview()->GetMainFrame()->url();
if (url.SchemeIs(chrome::kExtensionScheme))
return url.host();
return std::string();
@@ -192,7 +192,7 @@
if (!renderview)
return v8::Undefined();
- if (args.Length() != 4 || !args[0]->IsString() || !args[1]->IsString() ||
+ if (args.Length() != 4 || !args[0]->IsString() || !args[1]->IsString() ||
!args[2]->IsInt32() || !args[3]->IsBoolean())
return v8::Undefined();
« no previous file with comments | « chrome/renderer/extensions/event_bindings.cc ('k') | chrome/renderer/external_extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698