AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/autofill/autofill_manager.cc

 // Copyright (c) 2010 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 "chrome/browser/autofill/autofill_manager.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
-#include "chrome/browser/autofill/autofill_infobar_delegate.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 
@@ skipping 17 matching lines @@
 
 }  // namespace
 
 // TODO(jhawkins): Maybe this should be in a grd file?
 const char* kAutoFillLearnMoreUrl =
     "http://www.google.com/support/chrome/bin/answer.py?answer=142893";
 
 AutoFillManager::AutoFillManager(TabContents* tab_contents)
     : tab_contents_(tab_contents),
       personal_data_(NULL),
-      download_manager_(tab_contents_->profile()),
-      infobar_(NULL) {
+      download_manager_(tab_contents_->profile()) {
   DCHECK(tab_contents);
 
   // |personal_data_| is NULL when using TestTabContents.
   personal_data_ =
       tab_contents_->profile()->GetOriginalProfile()->GetPersonalDataManager();
   download_manager_.SetObserver(this);
 }
 
 AutoFillManager::~AutoFillManager() {
   download_manager_.SetObserver(NULL);
 }
 
 // static
 void AutoFillManager::RegisterBrowserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kAutoFillDialogPlacement);
 }
 
 // static
 void AutoFillManager::RegisterUserPrefs(PrefService* prefs) {
-  prefs->RegisterBooleanPref(prefs::kAutoFillInfoBarShown, false);
   prefs->RegisterBooleanPref(prefs::kAutoFillEnabled, true);
   prefs->RegisterBooleanPref(prefs::kAutoFillAuxiliaryProfilesEnabled, true);
 
   prefs->RegisterRealPref(prefs::kAutoFillPositiveUploadRate,
                           kAutoFillPositiveUploadRateDefaultValue);
   prefs->RegisterRealPref(prefs::kAutoFillNegativeUploadRate,
                           kAutoFillNegativeUploadRateDefaultValue);
 }
 
 void AutoFillManager::FormSubmitted(const FormData& form) {
   if (!IsAutoFillEnabled())
     return;
 
   if (tab_contents_->profile()->IsOffTheRecord())
     return;
 
   // Grab a copy of the form data.
   upload_form_structure_.reset(new FormStructure(form));
 
   if (!upload_form_structure_->IsAutoFillable())
     return;
 
   // Determine the possible field types and upload the form structure to the
   // PersonalDataManager.
   DeterminePossibleFieldTypes(upload_form_structure_.get());
   HandleSubmit();
-
-  if (upload_form_structure_->HasAutoFillableValues()) {
-    PrefService* prefs = tab_contents_->profile()->GetPrefs();
-    bool infobar_shown = prefs->GetBoolean(prefs::kAutoFillInfoBarShown);
-    if (!infobar_shown) {
-      // Ask the user for permission to save form information.
-      infobar_.reset(new AutoFillInfoBarDelegate(tab_contents_, this));
-    }
-  }
 }
 
 void AutoFillManager::FormsSeen(const std::vector<FormData>& forms) {
   if (!IsAutoFillEnabled())
     return;
 
   for (std::vector<FormData>::const_iterator iter =
            forms.begin();
        iter != forms.end(); ++iter) {
     FormStructure* form_structure = new FormStructure(*iter);
@@ skipping 204 matching lines @@
 }
 
 void AutoFillManager::ShowAutoFillDialog() {
   ::ShowAutoFillDialog(tab_contents_->GetContentNativeView(),
                        personal_data_,
                        tab_contents_->profile()->GetOriginalProfile(),
                        NULL,
                        NULL);
 }
 
-void AutoFillManager::OnInfoBarClosed() {
-  PrefService* prefs = tab_contents_->profile()->GetPrefs();
-  prefs->SetBoolean(prefs::kAutoFillEnabled, true);
-
-  // Save the imported form data as a profile.
-  personal_data_->SaveImportedFormData();
-}
-
-void AutoFillManager::OnInfoBarAccepted() {
-  PrefService* prefs = tab_contents_->profile()->GetPrefs();
-  prefs->SetBoolean(prefs::kAutoFillEnabled, true);
-
-  // This is the first time the user is interacting with AutoFill, so set the
-  // uploaded form structure as the initial profile and credit card in the
-  // AutoFillDialog.
-  AutoFillProfile* profile = NULL;
-  CreditCard* credit_card = NULL;
-  // TODO(dhollowa) Now that we aren't immediately saving the imported form
-  // data, we should store the profile and CC in the AFM instead of the PDM.
-  personal_data_->GetImportedFormData(&profile, &credit_card);
-  ::ShowAutoFillDialog(tab_contents_->GetContentNativeView(),
-                       personal_data_,
-                       tab_contents_->profile()->GetOriginalProfile(),
-                       profile,
-                       credit_card);
-}
-
-void AutoFillManager::OnInfoBarCancelled() {
-  PrefService* prefs = tab_contents_->profile()->GetPrefs();
-  prefs->SetBoolean(prefs::kAutoFillEnabled, false);
-}
-
 void AutoFillManager::Reset() {
   upload_form_structure_.reset();
   form_structures_.reset();
 }
 
 void AutoFillManager::OnLoadedAutoFillHeuristics(
     const std::string& heuristic_xml) {
   // TODO(jhawkins): Store |upload_required| in the AutoFillManager.
   UploadRequired upload_required;
   FormStructure::ParseQueryResponse(heuristic_xml,
@@ skipping 58 matching lines @@
 AutoFillManager::AutoFillManager()
     : tab_contents_(NULL),
       personal_data_(NULL),
       download_manager_(NULL) {
 }
 
 AutoFillManager::AutoFillManager(TabContents* tab_contents,
                                  PersonalDataManager* personal_data)
     : tab_contents_(tab_contents),
       personal_data_(personal_data),
-      download_manager_(NULL),  // No download manager in tests.
-      infobar_(NULL) {
+      download_manager_(NULL) {
   DCHECK(tab_contents);
 }
 
 void AutoFillManager::GetProfileSuggestions(FormStructure* form,
                                             const FormField& field,
                                             AutoFillType type,
                                             std::vector<string16>* values,
                                             std::vector<string16>* labels) {
   const std::vector<AutoFillProfile*>& profiles = personal_data_->profiles();
   for (std::vector<AutoFillProfile*>::const_iterator iter = profiles.begin();
@@ skipping 161 matching lines @@
     field->set_value(number);
   } else if (has_valid_suffix_and_prefix &&
              field->size() == kAutoFillPhoneNumberSuffixCount) {
     number = number.substr(kAutoFillPhoneNumberSuffixOffset,
                            kAutoFillPhoneNumberSuffixCount);
     field->set_value(number);
   } else {
     field->set_value(number);
   }
 }