commit a2ef54c1a1061112b48a583c466606ccf07dc28a
author jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Oct 10 16:20:31 2011
committer jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Oct 10 16:20:31 2011
tree dbef7f9418364ac59bf9d32cde8be4da8a98b625
parent 037ffc68a78fd89048dfebc3c1d72b12eac1287e

Make RenderView inherit from content::RenderView, and add missing functions to the interface. In a future change I'll rename RenderView to RenderViewImpl.

BUG=98716
Review URL: http://codereview.chromium.org/8201029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104727 0039d316-1c4b-4281-b951-d872f2087c98

chrome/renderer/autofill/autofill_agent.cc

diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc
index 57e8d1a..c85f6e4 100644
--- a/chrome/renderer/autofill/autofill_agent.cc
+++ b/chrome/renderer/autofill/autofill_agent.cc
@@ -12,7 +12,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/renderer/autofill/form_autofill_util.h"
 #include "chrome/renderer/autofill/password_autofill_manager.h"
-#include "content/renderer/render_view.h"
+#include "content/public/renderer/render_view.h"
 #include "grit/generated_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h"
@@ -48,7 +48,7 @@
 namespace autofill {
 
 AutofillAgent::AutofillAgent(
-    RenderView* render_view,
+    content::RenderView* render_view,
     PasswordAutofillManager* password_autofill_manager)
     : content::RenderViewObserver(render_view),
       password_autofill_manager_(password_autofill_manager),
@@ -60,7 +60,7 @@
       suggestions_options_index_(-1),
       has_shown_autofill_popup_for_current_edit_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
-  render_view->webview()->setAutofillClient(this);
+  render_view->GetWebView()->setAutofillClient(this);
 }
 
 AutofillAgent::~AutofillAgent() {}
@@ -244,7 +244,7 @@
                                           const std::vector<string16>& labels,
                                           const std::vector<string16>& icons,
                                           const std::vector<int>& unique_ids) {
-  WebKit::WebView* web_view = render_view()->webview();
+  WebKit::WebView* web_view = render_view()->GetWebView();
   if (!web_view || query_id != autofill_query_id_)
     return;
 
@@ -329,7 +329,7 @@
 
 void AutofillAgent::OnFormDataFilled(int query_id,
                                      const webkit_glue::FormData& form) {
-  if (!render_view()->webview() || query_id != autofill_query_id_)
+  if (!render_view()->GetWebView() || query_id != autofill_query_id_)
     return;
 
   switch (autofill_action_) {