AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/autofill/autofill_dialog_gtk.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_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/form_group.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/phone_number.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
-#include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 namespace {
 
 // The name of the object property used to store an entry widget pointer on
@@ skipping 185 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutoFillDialog
 //
 // The contents of the AutoFill dialog.  This dialog allows users to add, edit
 // and remove AutoFill profiles.
 class AutoFillDialog : public PersonalDataManager::Observer {
  public:
   AutoFillDialog(AutoFillDialogObserver* observer,
                  PersonalDataManager* personal_data_manager,
-                 PrefService* pref_service,
                  AutoFillProfile* imported_profile,
                  CreditCard* imported_credit_card);
   ~AutoFillDialog();
 
   // PersonalDataManager::Observer implementation:
   void OnPersonalDataLoaded();
 
   // Shows the AutoFill dialog.
   void Show();
 
@@ skipping 66 matching lines @@
   // if the address is not found.
   int FindIndexOfAddress(string16 billing_address);
 
   // Our observer.  May not be NULL.
   AutoFillDialogObserver* observer_;
 
   // The personal data manager, used to load AutoFill profiles and credit cards.
   // Unowned pointer, may not be NULL.
   PersonalDataManager* personal_data_;
 
-  // The preference service. Unowned pointer, may not be NULL.
-  PrefService* pref_service_;
-
   // The imported profile.  May be NULL.
   AutoFillProfile* imported_profile_;
 
   // The imported credit card.  May be NULL.
   CreditCard* imported_credit_card_;
 
   // The list of current AutoFill profiles.
   std::vector<AutoFillProfile> profiles_;
 
   // The list of current AutoFill credit cards.
@@ skipping 15 matching lines @@
   GtkWidget* creditcards_vbox_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoFillDialog);
 };
 
 // The singleton AutoFill dialog object.
 static AutoFillDialog* dialog = NULL;
 
 AutoFillDialog::AutoFillDialog(AutoFillDialogObserver* observer,
                                PersonalDataManager* personal_data_manager,
-                               PrefService* pref_service,
                                AutoFillProfile* imported_profile,
                                CreditCard* imported_credit_card)
     : observer_(observer),
       personal_data_(personal_data_manager),
-      pref_service_(pref_service),
       imported_profile_(imported_profile),
       imported_credit_card_(imported_credit_card) {
   DCHECK(observer_);
   DCHECK(personal_data_);
-  DCHECK(pref_service_);
 
   InitializeWidgets();
   LoadAutoFillData();
 
   gtk_util::ShowDialogWithLocalizedSize(dialog_,
                                         IDS_AUTOFILL_DIALOG_WIDTH_CHARS,
                                         IDS_AUTOFILL_DIALOG_HEIGHT_LINES,
                                         true);
 }
 
@@ skipping 605 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // Factory/finder method:
 
 void ShowAutoFillDialog(gfx::NativeView parent,
                         AutoFillDialogObserver* observer,
                         Profile* profile,
                         AutoFillProfile* imported_profile,
                         CreditCard* imported_credit_card) {
   DCHECK(profile);
 
-  // It's possible we haven't shown the InfoBar yet, but if the user is in the
-  // AutoFill dialog, she doesn't need to be asked to enable or disable
-  // AutoFill.
-  profile->GetPrefs()->SetBoolean(prefs::kAutoFillInfoBarShown, true);
-
   if (!dialog) {
     dialog = new AutoFillDialog(observer,
                                 profile->GetPersonalDataManager(),
-                                profile->GetPrefs(),
                                 imported_profile,
                                 imported_credit_card);
   }
   dialog->Show();
 }