diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 16:55:27 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 16:55:27 +0000 |
| commit | 26aa04898e37692f354a9f97df01ff1fc7bbb14e (patch) | |
| tree | d83f599bdc5083646ea70aec4c6906707e671b71 /chrome/renderer/extensions | |
| parent | fbc805556ed3f7e15718313907481821ef6908b4 (diff) | |
| download | chromium_src-26aa04898e37692f354a9f97df01ff1fc7bbb14e.zip chromium_src-26aa04898e37692f354a9f97df01ff1fc7bbb14e.tar.gz chromium_src-26aa04898e37692f354a9f97df01ff1fc7bbb14e.tar.bz2 | |
Hook up webkit/api/public/WebView.h
This change does not completely eliminate webkit/glue/webview.h. Instead,
the old WebView extends from the new WebView temporarily as we complete
the transition.
R=dglazkov
BUG=10033
TEST=none
Review URL: http://codereview.chromium.org/257001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions')
| -rw-r--r-- | chrome/renderer/extensions/extension_process_bindings.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc index 1a461a8..6603582 100644 --- a/chrome/renderer/extensions/extension_process_bindings.cc +++ b/chrome/renderer/extensions/extension_process_bindings.cc @@ -115,7 +115,7 @@ class ExtensionImpl : public ExtensionBase { static std::string ExtensionIdForCurrentContext() { RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext(); DCHECK(renderview); - GURL url = renderview->webview()->GetMainFrame()->url(); + GURL url = renderview->webview()->mainFrame()->url(); if (url.SchemeIs(chrome::kExtensionScheme)) return url.host(); return std::string(); @@ -209,7 +209,7 @@ class ExtensionImpl : public ExtensionBase { if (!ViewTypeMatches((*it)->view_type(), view_type)) continue; - GURL url = (*it)->webview()->GetMainFrame()->url(); + GURL url = (*it)->webview()->mainFrame()->url(); if (!url.SchemeIs(chrome::kExtensionScheme)) continue; std::string extension_id = url.host(); @@ -222,7 +222,7 @@ class ExtensionImpl : public ExtensionBase { } v8::Local<v8::Context> context = - (*it)->webview()->GetMainFrame()->mainWorldScriptContext(); + (*it)->webview()->mainFrame()->mainWorldScriptContext(); if (!context.IsEmpty()) { v8::Local<v8::Value> window = context->Global(); DCHECK(!window.IsEmpty()); @@ -516,7 +516,7 @@ void ExtensionProcessBindings::SetViewType(WebView* view, return; v8::HandleScope handle_scope; - WebFrame* frame = view->GetMainFrame(); + WebFrame* frame = view->mainFrame(); v8::Local<v8::Context> context = frame->mainWorldScriptContext(); v8::Handle<v8::Value> argv[1]; argv[0] = v8::String::New(type_str); |