Abstracted AutofillMsg_SetNodeText IPC out of core autofill code.

components/autofill/core/browser/autofill_external_delegate.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
 #include "components/autofill/core/browser/password_autofill_manager.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "ui/gfx/rect.h"
 
 namespace gfx {
 class Rect;
 }
 
-namespace content {
-class WebContents;
-}
-
 namespace autofill {
 
 class AutofillDriver;
 class AutofillManager;
 
 // TODO(csharp): A lot of the logic in this class is copied from autofillagent.
 // Once Autofill is moved out of WebKit this class should be the only home for
 // this logic. See http://crbug.com/51644
 
 // Delegate for in-browser Autocomplete and Autofill display and selection.
@@ skipping 58 matching lines @@
   // Returns the delegate to its starting state by removing any page specific
   // values or settings.
   void Reset();
 
   // Inform the Password Manager of a filled form.
   void AddPasswordFormMapping(
       const FormFieldData& form,
       const PasswordFormFillData& fill_data);
 
  protected:
-  content::WebContents* web_contents() { return web_contents_; }
-
   base::WeakPtr<AutofillExternalDelegate> GetWeakPtr();
 
  private:
   // Fills the form with the Autofill data corresponding to |unique_id|.
   // If |is_preview| is true then this is just a preview to show the user what
   // would be selected and if |is_preview| is false then the user has selected
   // this data.
   void FillAutofillFormData(int unique_id, bool is_preview);
 
   // Handle applying any Autofill warnings to the Autofill popup.
@@ skipping 10 matching lines @@
                             std::vector<base::string16>* autofill_icons,
                             std::vector<int>* autofill_unique_ids);
 
   // Insert the data list values at the start of the given list, including
   // any required separators.
   void InsertDataListValues(std::vector<base::string16>* autofill_values,
                             std::vector<base::string16>* autofill_labels,
                             std::vector<base::string16>* autofill_icons,
                             std::vector<int>* autofill_unique_ids);
 
-  // The web_contents associated with this delegate.
-  content::WebContents* web_contents_;  // weak; owns me.
   AutofillManager* autofill_manager_;  // weak.
 
   // Provides driver-level context to the shared code of the component. Must

[blundell, 2013/11/13 15:26:49]

This actually should stay, sorry. It *is* an assumption made by this class that
the driver outlives it.

[jif-google, 2013/11/13 16:43:03]

Ok. I removed it because I felt like it was redundant because of the "//  weak".

   // outlive this object.
   AutofillDriver* autofill_driver_;  // weak

[blundell, 2013/11/13 11:55:45]

It's the AutofillDriver that owns the AutofillExternalDelegate instance now, but
I don't think it makes sense to put that comment here, as the core code doesn't
have that knowledge.

[jif-google, 2013/11/13 14:20:25]

I've removed the "Must outlive this object." part.

 
   // Password Autofill manager, handles all password-related Autofilling.
   PasswordAutofillManager password_autofill_manager_;
 
   // The ID of the last request sent for form field Autofill.  Used to ignore
   // out of date responses.
   int autofill_query_id_;
 
   // The current form and field selected by Autofill.
   FormData autofill_query_form_;
@@ skipping 17 matching lines @@
   std::vector<base::string16> data_list_labels_;
 
   base::WeakPtrFactory<AutofillExternalDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillExternalDelegate);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_