TabContentsWrapper -> TabContents, part 5.

chrome/browser/autofill/autofill_external_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::RenderViewHost;
 using WebKit::WebAutofillClient;
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {
 }
 
 AutofillExternalDelegate::AutofillExternalDelegate(
-    TabContentsWrapper* tab_contents_wrapper,
+    TabContents* tab_contents,
     AutofillManager* autofill_manager)
-    : tab_contents_wrapper_(tab_contents_wrapper),
+    : tab_contents_(tab_contents),
       autofill_manager_(autofill_manager),
       password_autofill_manager_(
-          tab_contents_wrapper ? tab_contents_wrapper->web_contents() : NULL),
+          tab_contents ? tab_contents->web_contents() : NULL),
       autofill_query_id_(0),
       display_warning_if_disabled_(false),
       has_shown_autofill_popup_for_current_edit_(false) {
 }
 
 void AutofillExternalDelegate::SelectAutofillSuggestionAtIndex(int unique_id) {
   if (unique_id == WebAutofillClient::MenuItemIDAutofillOptions ||
       unique_id == WebAutofillClient::MenuItemIDClearForm ||
       unique_id == WebAutofillClient::MenuItemIDSeparator ||
       unique_id == WebAutofillClient::MenuItemIDWarningMessage)
@@ skipping 98 matching lines @@
     v.pop_back();
     l.pop_back();
     i.pop_back();
     ids.pop_back();
   }
 
   // Send to display.
   if (!v.empty() && autofill_query_field_.is_focusable)
     ApplyAutofillSuggestions(v, l, i, ids);
 
-  tab_contents_wrapper_->autofill_manager()->OnDidShowAutofillSuggestions(
+  tab_contents_->autofill_manager()->OnDidShowAutofillSuggestions(
       has_autofill_item && !has_shown_autofill_popup_for_current_edit_);
   has_shown_autofill_popup_for_current_edit_ |= has_autofill_item;
 }
 
 void AutofillExternalDelegate::OnShowPasswordSuggestions(
     const std::vector<string16>& suggestions,
     const webkit::forms::FormField& field,
     const gfx::Rect& bounds) {
   autofill_query_field_ = field;
 
   if (suggestions.empty()) {
     HideAutofillPopup();
     return;
   }
 
   SetBounds(bounds);
 
   std::vector<string16> empty(suggestions.size());
   std::vector<int> password_ids(suggestions.size(),
                                 WebAutofillClient::MenuItemIDPasswordEntry);
   ApplyAutofillSuggestions(suggestions, empty, empty, password_ids);
 }
 
 void AutofillExternalDelegate::RemoveAutocompleteEntry(const string16& value) {
-  if (tab_contents_wrapper_) {
-    tab_contents_wrapper_->autocomplete_history_manager()->
+  if (tab_contents_) {
+    tab_contents_->autocomplete_history_manager()->
         OnRemoveAutocompleteEntry(autofill_query_field_.name, value);
   }
 }
 
 void AutofillExternalDelegate::RemoveAutofillProfileOrCreditCard(
     int unique_id) {
   autofill_manager_->RemoveAutofillProfileOrCreditCard(unique_id);
 }
 
 
 void AutofillExternalDelegate::DidEndTextFieldEditing() {
   HideAutofillPopup();
 
   has_shown_autofill_popup_for_current_edit_ = false;
 }
 
 bool AutofillExternalDelegate::DidAcceptAutofillSuggestions(
     const string16& value,
     int unique_id,
     unsigned index) {
   // If the selected element is a warning we don't want to do anything.
   if (unique_id == WebAutofillClient::MenuItemIDWarningMessage)
     return false;
 
   if (unique_id == WebAutofillClient::MenuItemIDAutofillOptions) {
     // User selected 'Autofill Options'.
     autofill_manager_->OnShowAutofillDialog();
   } else if (unique_id == WebAutofillClient::MenuItemIDClearForm) {
     // User selected 'Clear form'.
-    RenderViewHost* host =
-        tab_contents_wrapper_->web_contents()->GetRenderViewHost();
+    RenderViewHost* host = tab_contents_->web_contents()->GetRenderViewHost();
     host->Send(new AutofillMsg_ClearForm(host->GetRoutingID()));
   } else if (unique_id == WebAutofillClient::MenuItemIDPasswordEntry &&
              password_autofill_manager_.DidAcceptAutofillSuggestion(
                  autofill_query_field_, value)) {
     // DidAcceptAutofillSuggestion has already handled the work to fill in
     // the page as required.
   } else if (unique_id == WebAutofillClient::MenuItemIDAutocompleteEntry) {
     // User selected an Autocomplete, so we fill directly.
-    RenderViewHost* host =
-        tab_contents_wrapper_->web_contents()->GetRenderViewHost();
+    RenderViewHost* host = tab_contents_->web_contents()->GetRenderViewHost();
     host->Send(new AutofillMsg_SetNodeText(
         host->GetRoutingID(),
         value));
   } else {
     FillAutofillFormData(unique_id, false);
   }
 
   HideAutofillPopup();
 
   return true;
 }
 
 void AutofillExternalDelegate::ClearPreviewedForm() {
-  RenderViewHost* host =
-      tab_contents_wrapper_->web_contents()->GetRenderViewHost();
+  RenderViewHost* host = tab_contents_->web_contents()->GetRenderViewHost();
   host->Send(new AutofillMsg_ClearPreviewedForm(host->GetRoutingID()));
 }
 
 void AutofillExternalDelegate::HideAutofillPopup() {
   HideAutofillPopupInternal();
 }
 
 void AutofillExternalDelegate::Reset() {
   HideAutofillPopup();
 
   password_autofill_manager_.Reset();
 }
 
 void AutofillExternalDelegate::AddPasswordFormMapping(
       const webkit::forms::FormField& form,
       const webkit::forms::PasswordFormFillData& fill_data) {
     password_autofill_manager_.AddPasswordFormMapping(form, fill_data);
 }
 
 void AutofillExternalDelegate::FillAutofillFormData(int unique_id,
                                                     bool is_preview) {
-  RenderViewHost* host =
-      tab_contents_wrapper_->web_contents()->GetRenderViewHost();
+  RenderViewHost* host = tab_contents_->web_contents()->GetRenderViewHost();
 
   if (is_preview) {
     host->Send(new AutofillMsg_SetAutofillActionPreview(
         host->GetRoutingID()));
   } else {
     host->Send(new AutofillMsg_SetAutofillActionFill(
         host->GetRoutingID()));
   }
 
   // Fill the values for the whole form.
   autofill_manager_->OnFillAutofillFormData(autofill_query_id_,
                                             autofill_query_form_,
                                             autofill_query_field_,
                                             unique_id);
 }
 
 // Add a "!defined(OS_YOUROS) for each platform that implements this
 // in an autofill_external_delegate_YOUROS.cc.  Currently there are
 // none, so all platforms use the default.
 
 #if !defined(OS_ANDROID) && !defined(TOOLKIT_GTK)
 
 AutofillExternalDelegate* AutofillExternalDelegate::Create(
-    TabContentsWrapper*, AutofillManager*) {
+    TabContents*, AutofillManager*) {
   return NULL;
 }
 
 #endif