UI changes to Autofill dialogs according to the latest mocks...

chrome/browser/views/autofill_profiles_view_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_AUTOFILL_PROFILES_VIEW_WIN_H_
 #define CHROME_BROWSER_VIEWS_AUTOFILL_PROFILES_VIEW_WIN_H_
 
 #include <list>
 #include <vector>
 
 #include "app/combobox_model.h"
 #include "app/table_model.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/link.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/focus/focus_manager.h"
 #include "views/view.h"
 #include "views/window/dialog_delegate.h"
 
 namespace views {
+class Checkbox;
 class GridLayout;
 class ImageButton;
 class Label;
 class RadioButton;
 class TableView;
 class TextButton;
 }
 
 class PrefService;
 class SkBitmap;
@@ skipping 18 matching lines @@
                              public views::LinkController,
                              public views::FocusChangeListener,
                              public views::TableViewObserver,
                              public PersonalDataManager::Observer {
  public:
   virtual ~AutoFillProfilesView();
 
   static int Show(gfx::NativeWindow parent,
                   AutoFillDialogObserver* observer,
                   PersonalDataManager* personal_data_manager,
+                  Profile* profile,
                   PrefService* preferences,
                   AutoFillProfile* imported_profile,
                   CreditCard* imported_credit_card);
 
  protected:
   // forward declaration. This struct defined further down.
   struct EditableSetInfo;
   // Called when 'Add Address' (|group_type| is
   // ContentListTableModel::kAddressGroup) or 'Add Credit Card' (|group_type| is
   // ContentListTableModel::kCreditCardGroup) is clicked.
   void AddClicked(int group_type);
   // Called when 'Edit...' is clicked.
   void EditClicked();
   // Called when 'Remove' is clicked.
   void DeleteClicked();
 
   // Updates state of the buttons.
   void UpdateButtonState();
 
+  // Updates inferred labels.
+  void UpdateProfileLabels();
+
   // Following two functions are called from opened child dialog to
   // disable/enable buttons.
   void ChildWindowOpened();
   void ChildWindowClosed();
 
   // Returns warning bitmap to set on warning indicator. If |good| is true it
   // returns the bitmap idicating validity, if false - indicating error.
   // Caller owns the bitmap after the call.
   SkBitmap* GetWarningBimap(bool good);
 
@@ skipping 29 matching lines @@
 
   // views::FocusChangeListener methods:
   virtual void FocusWillChange(views::View* focused_before,
                                views::View* focused_now);
 
   // views::TableViewObserver methods:
   virtual void OnSelectionChanged();
   virtual void OnDoubleClick();
 
   // PersonalDataManager::Observer methods:
-  void OnPersonalDataLoaded();
+  virtual void OnPersonalDataLoaded();
 
   // Helper structure to keep info on one address or credit card.
   // Keeps info on one item in EditableSetViewContents.
   // Also keeps info on opened status. Allows to quickly add and delete items,
   // and then rebuild EditableSetViewContents.
   struct EditableSetInfo {
     bool is_address;
     bool has_credit_card_number_been_edited;
     // If |is_address| is true |address| has some data and |credit_card|
     // is empty, and vice versa
@@ skipping 19 matching lines @@
 
   struct FocusedItem {
     int group;
     int item;
     FocusedItem() : group(kNoItemFocused), item(kNoItemFocused) {}
     FocusedItem(int g, int i) : group(g), item(i) {}
   };
 
   AutoFillProfilesView(AutoFillDialogObserver* observer,
                        PersonalDataManager* personal_data_manager,
+                       Profile* profile,
                        PrefService* preferences,
                        AutoFillProfile* imported_profile,
                        CreditCard* imported_credit_card);
   void Init();
 
   void GetData();
   bool IsDataReady() const;
 
   // Rebuilds the view by deleting and re-creating sub-views
   void RebuildView(const FocusedItem& new_focus_index);
@@ skipping 85 matching lines @@
                                  const string16& new_contents);
     virtual bool HandleKeystroke(views::Textfield* sender,
                                  const views::Textfield::Keystroke& keystroke);
 
     // views::Combobox::Listener methods:
     virtual void ItemChanged(views::Combobox* combo_box,
                              int prev_index,
                              int new_index);
    private:
     enum TextFields {
-      TEXT_LABEL,
       TEXT_FULL_NAME,
       TEXT_COMPANY,
       TEXT_EMAIL,
       TEXT_ADDRESS_LINE_1,
       TEXT_ADDRESS_LINE_2,
       TEXT_ADDRESS_CITY,
       TEXT_ADDRESS_STATE,
       TEXT_ADDRESS_ZIP,
       TEXT_ADDRESS_COUNTRY,
       TEXT_PHONE_PHONE,
       TEXT_FAX_PHONE,
       TEXT_CC_NAME,
       TEXT_CC_NUMBER,
       // must be last
       MAX_TEXT_FIELD
     };
 
-    void InitTitle(views::GridLayout* layout);
     void InitAddressFields(views::GridLayout* layout);
     void InitCreditCardFields(views::GridLayout* layout);
     void InitLayoutGrid(views::GridLayout* layout);
     views::Label* CreateLeftAlignedLabel(int label_id);
 
-    bool LabelValid() const;
     void UpdateButtons();
 
     void UpdateContentsPhoneViews(TextFields field,
                                   views::Textfield* sender,
                                   const string16& new_contents);
 
     views::Textfield* text_fields_[MAX_TEXT_FIELD];
     std::vector<EditableSetInfo>::iterator editable_fields_set_;
     EditableSetInfo temporary_info_;
-    views::ImageButton* label_warning_button_;
     AutoFillProfilesView* observer_;
     AddressComboBoxModel* billing_model_;
     views::Combobox* combo_box_billing_;
     scoped_ptr<StringVectorComboboxModel> combo_box_model_month_;
     views::Combobox* combo_box_month_;
     scoped_ptr<StringVectorComboboxModel> combo_box_model_year_;
     views::Combobox* combo_box_year_;
     bool new_item_;
     std::vector<PhoneSubView*> phone_sub_views_;
 
@@ skipping 33 matching lines @@
     // times if several combo boxes relying on the model.
     // Model does not own |combo_box|.
     void UsedWithComboBox(views::Combobox *combo_box);
 
     // Need to be called when comboboxes are destroyed.
     void ClearComboBoxes() { combo_boxes_.clear(); }
 
     // Call this function if one of the labels has changed
     void LabelChanged();
 
-    // Gets index of the string in the model or -1 if not found.
-    int GetIndex(const string16 &s);
+    // Gets index of the item in the model or -1 if not found.
+    int GetIndex(int unique_id);
 
     // ComboboxModel methods, public as they used from EditableSetViewContents
     virtual int GetItemCount();
     virtual std::wstring GetItemAt(int index);
 
    private:
     std::list<views::Combobox *> combo_boxes_;
     const std::vector<EditableSetInfo>* address_labels_;
     bool is_billing_;
 
@@ skipping 54 matching lines @@
    private:
     std::vector<EditableSetInfo>* profiles_;
     std::vector<EditableSetInfo>* credit_cards_;
     TableModelObserver* observer_;
 
     DISALLOW_COPY_AND_ASSIGN(ContentListTableModel);
   };
 
   AutoFillDialogObserver* observer_;
   PersonalDataManager* personal_data_manager_;
+  Profile* profile_;
   PrefService* preferences_;
   std::vector<EditableSetInfo> profiles_set_;
   std::vector<EditableSetInfo> credit_card_set_;
 
   AddressComboBoxModel billing_model_;
 
+  views::Checkbox* enable_auto_fill_button_;
   views::Button* add_address_button_;
   views::Button* add_credit_card_button_;
   views::Button* edit_button_;
   views::Button* remove_button_;
   views::TableView* scroll_view_;
   scoped_ptr<ContentListTableModel> table_model_;
   views::FocusManager* focus_manager_;
   bool child_dialog_opened_;
 
   static AutoFillProfilesView* instance_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoFillProfilesView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_AUTOFILL_PROFILES_VIEW_WIN_H_