Add the ability to save and remove AutoFill profiles from the AutoFillDialog....

chrome/browser/webdata/web_data_service.h

 // Copyright (c) 2009 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_WEBDATA_WEB_DATA_SERVICE_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 
 #include <map>
 #include <vector>
 
@@ skipping 36 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataService results
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 //
 // Result types
 //
 typedef enum {
-  BOOL_RESULT = 1,         // WDResult<bool>
-  KEYWORDS_RESULT,         // WDResult<WDKeywordsResult>
-  INT64_RESULT,            // WDResult<int64>
-  PASSWORD_RESULT,         // WDResult<std::vector<PasswordForm*>>
+  BOOL_RESULT = 1,          // WDResult<bool>
+  KEYWORDS_RESULT,          // WDResult<WDKeywordsResult>
+  INT64_RESULT,             // WDResult<int64>
+  PASSWORD_RESULT,          // WDResult<std::vector<PasswordForm*>>
 #if defined(OS_WIN)
-  PASSWORD_IE7_RESULT,     // WDResult<IE7PasswordInfo>
+  PASSWORD_IE7_RESULT,      // WDResult<IE7PasswordInfo>
 #endif
-  WEB_APP_IMAGES,          // WDResult<WDAppImagesResult>
-  AUTOFILL_VALUE_RESULT,   // WDResult<std::vector<string16>>
-  AUTOFILL_CHANGES,        // WDResult<std::vector<AutofillChange>>
-  AUTOFILL_PROFILE_RESULT  // WDResult<AutoFillProfile>
+  WEB_APP_IMAGES,           // WDResult<WDAppImagesResult>
+  AUTOFILL_VALUE_RESULT,    // WDResult<std::vector<string16>>
+  AUTOFILL_CHANGES,         // WDResult<std::vector<AutofillChange>>
+  AUTOFILL_PROFILE_RESULT,  // WDResult<AutoFillProfile>
+  AUTOFILL_PROFILES_RESULT  // WDResult<std::vector<AutoFillProfile*>>
 } WDResultType;
 
 typedef std::vector<AutofillChange> AutofillChangeList;
 
 // Result from GetWebAppImages.
 struct WDAppImagesResult {
   WDAppImagesResult() : has_all_images(false) {}
 
   // True if SetWebAppHasAllImages(true) was invoked.
   bool has_all_images;
 
   // The images, may be empty.
   std::vector<SkBitmap> images;
 };
 
 struct WDKeywordsResult {
   std::vector<TemplateURL*> keywords;
   // Identifies the ID of the TemplateURL that is the default search. A value of
   // 0 indicates there is no default search provider.
   int64 default_search_provider_id;
-  // Version of the builin keywords. A value of 0 indicates a first run.
+  // Version of the built-in keywords. A value of 0 indicates a first run.
   int builtin_keyword_version;
 };
 
 //
 // The top level class for a result.
 //
 class WDTypedResult {
  public:
   virtual ~WDTypedResult() {}
 
@@ skipping 308 matching lines @@
   void RemoveFormValueForElementName(const string16& name,
                                      const string16& value);
 
   // Schedules a task to add an AutoFill profile to the web database.
   void AddAutoFillProfile(const AutoFillProfile& profile);
 
   // Schedules a task to update an AutoFill profile in the web database.
   void UpdateAutoFillProfile(const AutoFillProfile& profile);
 
   // Schedules a task to remove an AutoFill profile from the web database.
-  void RemoveAutoFillProfile(const AutoFillProfile& profile);
+  // |profile_id| is the unique ID of the profile.
+  void RemoveAutoFillProfile(int profile_id);
 
-  // Initiates the request for an AutoFill profile with label |label.  The
+  // Initiates the request for an AutoFill profile with label |label|.  The
   // method OnWebDataServiceRequestDone of |consumer| gets called back when the
   // request is finished, with the profile included in the argument |result|.
   Handle GetAutoFillProfileForLabel(const string16& label,
                                     WebDataServiceConsumer* consumer);
 
+  // Initiates the request for all AutoFill profiles.  The method
+  // OnWebDataServiceRequestDone of |consumer| gets called when the request is
+  // finished, with the profiles included in the argument |result|.  The
+  // consumer owns the profiles.
+  Handle GetAutoFillProfiles(WebDataServiceConsumer* consumer);
+
   // Testing
 #ifdef UNIT_TEST
   void set_failed_init(bool value) { failed_init_ = value; }
 #endif
 
  protected:
   friend class TemplateURLModelTest;
   friend class TemplateURLModelTestingProfile;
   friend class WebDataServiceTest;
   friend class WebDataRequest;
@@ skipping 22 matching lines @@
                           std::vector<TemplateURL*> > SetKeywordsRequest;
 
   ~WebDataService();
 
   // Invoked on the main thread if initializing the db fails.
   void DBInitFailed(sql::InitStatus init_status);
 
   // Initialize the database, if it hasn't already been initialized.
   void InitializeDatabaseIfNecessary();
 
+  // The notification method.
+  void NotifyDatabaseLoadedOnUIThread();
+
   // Commit any pending transaction and deletes the database.
   void ShutdownDatabase();
 
   // Commit the current transaction and creates a new one.
   void Commit();
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Keywords.
   //
@@ skipping 32 matching lines @@
   void AddFormFieldValuesImpl(
       GenericRequest<std::vector<webkit_glue::FormField> >* request);
   void GetFormValuesForElementNameImpl(WebDataRequest* request,
       const string16& name, const string16& prefix, int limit);
   void RemoveFormElementsAddedBetweenImpl(
       GenericRequest2<base::Time, base::Time>* request);
   void RemoveFormValueForElementNameImpl(
       GenericRequest2<string16, string16>* request);
   void AddAutoFillProfileImpl(GenericRequest<AutoFillProfile>* request);
   void UpdateAutoFillProfileImpl(GenericRequest<AutoFillProfile>* request);
-  void RemoveAutoFillProfileImpl(GenericRequest<AutoFillProfile>* request);
+  void RemoveAutoFillProfileImpl(GenericRequest<int>* request);
   void GetAutoFillProfileForLabelImpl(WebDataRequest* request,
                                       const string16& label);
+  void GetAutoFillProfilesImpl(WebDataRequest* request);
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Web Apps.
   //
   //////////////////////////////////////////////////////////////////////////////
 
   void SetWebAppImageImpl(GenericRequest2<GURL, SkBitmap>* request);
 
   void SetWebAppHasAllImagesImpl(GenericRequest2<GURL, bool>* request);
@@ skipping 52 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 class WebDataServiceConsumer {
  public:
 
   // Called when a request is done. h uniquely identifies the request.
   // result can be NULL, if no result is expected or if the database could
   // not be opened. The result object is destroyed after this call.
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result) = 0;
+
+ protected:
+  virtual ~WebDataServiceConsumer() {}
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__