Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / autofill / data_model_wrapper.h

diff --git a/src/chrome/browser/ui/autofill/data_model_wrapper.h b/src/chrome/browser/ui/autofill/data_model_wrapper.h
index 3cb5661..6f79c84 100644 (file)
--- a/src/chrome/browser/ui/autofill/data_model_wrapper.h
+++ b/src/chrome/browser/ui/autofill/data_model_wrapper.h
@@ -5,11 +5,14 @@
 #ifndef CHROME_BROWSER_UI_AUTOFILL_DATA_MODEL_WRAPPER_H_
 #define CHROME_BROWSER_UI_AUTOFILL_DATA_MODEL_WRAPPER_H_
 
+#include <vector>
+
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
 #include "components/autofill/core/browser/field_types.h"
+#include "components/autofill/core/browser/form_structure.h"
 
 namespace gfx {
 class Image;
@@ -65,34 +68,17 @@ class DataModelWrapper {
   // FormStructure should be filled in or left alone. Returns whether any fields
   // in |form_structure| were found to be matching.
   bool FillFormStructure(
-      const DetailInputs& inputs,
-      const InputFieldComparator& compare,
+      const std::vector<ServerFieldType>& types,
+      const FormStructure::InputFieldComparator& compare,
       FormStructure* form_structure) const;
 
  protected:
   DataModelWrapper();
 
  private:
-  // Formats address data into a single string using |separator| between
-  // fields.
-  base::string16 GetAddressDisplayText(const base::string16& separator);
-
   DISALLOW_COPY_AND_ASSIGN(DataModelWrapper);
 };
 
-// A DataModelWrapper that does not hold data and does nothing when told to
-// fill in a form.
-class EmptyDataModelWrapper : public DataModelWrapper {
- public:
-  EmptyDataModelWrapper();
-  virtual ~EmptyDataModelWrapper();
-
-  virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
-
- protected:
-  DISALLOW_COPY_AND_ASSIGN(EmptyDataModelWrapper);
-};
-
 // A DataModelWrapper for Autofill profiles.
 class AutofillProfileWrapper : public DataModelWrapper {
  public:
@@ -219,20 +205,6 @@ class FullWalletShippingWrapper : public DataModelWrapper {
   DISALLOW_COPY_AND_ASSIGN(FullWalletShippingWrapper);
 };
 
-// A DataModelWrapper to copy the output of one section to the input of another.
-class DetailOutputWrapper : public DataModelWrapper {
- public:
-  explicit DetailOutputWrapper(const DetailOutputMap& outputs);
-  virtual ~DetailOutputWrapper();
-
-  virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
-
- private:
-  const DetailOutputMap& outputs_;
-
-  DISALLOW_COPY_AND_ASSIGN(DetailOutputWrapper);
-};
-
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_DATA_MODEL_WRAPPER_H_