Remove DataModelWrapper from android build.

chrome/browser/ui/autofill/data_model_wrapper.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_DATA_MODEL_WRAPPER_H_
 #define CHROME_BROWSER_UI_AUTOFILL_DATA_MODEL_WRAPPER_H_
 

[aruslan, 2014/01/27 19:05:36]

#include <vector>

[Evan Stade, 2014/01/27 19:45:41]

Done.

 #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;
 }
 
 namespace autofill {
 
 class AutofillDataModel;
 class AutofillProfile;
 class AutofillType;
@@ skipping 20 matching lines @@
   // into a web form.
   virtual base::string16 GetInfo(const AutofillType& type) const = 0;
 
   // Returns the data for a specified type in a format optimized for displaying
   // to the user.
   virtual base::string16 GetInfoForDisplay(const AutofillType& type) const;
 
   // Returns the icon, if any, that represents this model.
   virtual gfx::Image GetIcon();
 
-#if !defined(OS_ANDROID)
   // Gets text to display to the user to summarize this data source. The
   // default implementation assumes this is an address. Both params are required
   // to be non-NULL and will be filled in with text that is vertically compact
   // (but may take up a lot of horizontal space) and horizontally compact (but
   // may take up a lot of vertical space) respectively. The return value will
   // be true and the outparams will be filled in only if the data represented is
   // complete and valid.
   virtual bool GetDisplayText(base::string16* vertically_compact,
                               base::string16* horizontally_compact);
-#endif
 
   // Fills in |form_structure| with the data that this model contains. |inputs|
   // and |comparator| are used to determine whether each field in the
   // 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:
   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:
   explicit AutofillProfileWrapper(const AutofillProfile* profile);
   AutofillProfileWrapper(const AutofillProfile* profile,
                          const AutofillType& variant_type,
                          size_t variant);
   virtual ~AutofillProfileWrapper();
 
   virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
@@ skipping 29 matching lines @@
 };
 
 // A DataModelWrapper specifically for Autofill CreditCard data.
 class AutofillCreditCardWrapper : public DataModelWrapper {
  public:
   explicit AutofillCreditCardWrapper(const CreditCard* card);
   virtual ~AutofillCreditCardWrapper();
 
   virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
   virtual gfx::Image GetIcon() OVERRIDE;
-#if !defined(OS_ANDROID)
   virtual bool GetDisplayText(base::string16* vertically_compact,
                               base::string16* horizontally_compact) OVERRIDE;
-#endif
 
  private:
   const CreditCard* card_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillCreditCardWrapper);
 };
 
 // A DataModelWrapper for Wallet addresses.
 class WalletAddressWrapper : public DataModelWrapper {
  public:
   explicit WalletAddressWrapper(const wallet::Address* address);
   virtual ~WalletAddressWrapper();
 
   virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
   virtual base::string16 GetInfoForDisplay(const AutofillType& type) const
       OVERRIDE;
-#if !defined(OS_ANDROID)
   virtual bool GetDisplayText(base::string16* vertically_compact,
                               base::string16* horizontally_compact) OVERRIDE;
-#endif
 
  private:
   const wallet::Address* address_;
 
   DISALLOW_COPY_AND_ASSIGN(WalletAddressWrapper);
 };
 
 // A DataModelWrapper for Wallet instruments.
 class WalletInstrumentWrapper : public DataModelWrapper {
  public:
   explicit WalletInstrumentWrapper(
       const wallet::WalletItems::MaskedInstrument* instrument);
   virtual ~WalletInstrumentWrapper();
 
   virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
   virtual base::string16 GetInfoForDisplay(const AutofillType& type) const
       OVERRIDE;
   virtual gfx::Image GetIcon() OVERRIDE;
-#if !defined(OS_ANDROID)
   virtual bool GetDisplayText(base::string16* vertically_compact,
                               base::string16* horizontally_compact) OVERRIDE;
-#endif
 
  private:
   const wallet::WalletItems::MaskedInstrument* instrument_;
 
   DISALLOW_COPY_AND_ASSIGN(WalletInstrumentWrapper);
 };
 
 // A DataModelWrapper for FullWallet billing data.
 class FullWalletBillingWrapper : public DataModelWrapper {
  public:
   explicit FullWalletBillingWrapper(wallet::FullWallet* full_wallet);
   virtual ~FullWalletBillingWrapper();
 
   virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
-#if !defined(OS_ANDROID)
   virtual bool GetDisplayText(base::string16* vertically_compact,
                               base::string16* horizontally_compact) OVERRIDE;
-#endif
 
  private:
   wallet::FullWallet* full_wallet_;
 
   DISALLOW_COPY_AND_ASSIGN(FullWalletBillingWrapper);
 };
 
 // A DataModelWrapper for FullWallet shipping data.
 class FullWalletShippingWrapper : public DataModelWrapper {
  public:
@@ skipping 18 matching lines @@
 
  private:
   const FieldValueMap& field_map_;
 
   DISALLOW_COPY_AND_ASSIGN(FieldMapWrapper);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_DATA_MODEL_WRAPPER_H_