Autofill: Two small fixes.

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_
 #pragma once
 
 #include <list>
 #include <vector>
@@ skipping 12 matching lines @@
 #include "views/window/dialog_delegate.h"
 
 namespace views {
 class Checkbox;
 class GridLayout;
 class ImageButton;
 class Label;
 class RadioButton;
 class TableView;
 class TextButton;
-}
+}  // namespace views
 
 class PrefService;
 class SkBitmap;
 
 ///////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView
 //
 //  The contents of the "AutoFill profiles" dialog window.
 //
 // Overview: has following sub-views:
@@ skipping 17 matching lines @@
 
   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.
+  // 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();
 
@@ skipping 137 matching lines @@
     void UpdateButtons();
     AutoFillProfilesView* autofill_view_;
     views::Label* label_;
     views::Textfield* text_phone_;
     views::ImageButton* phone_warning_button_;
     bool last_state_;
 
     DISALLOW_COPY_AND_ASSIGN(PhoneSubView);
   };
 
-  // forward declaration
+  // Forward declaration.
   class AddressComboBoxModel;
   class StringVectorComboboxModel;
 
   // Sub-view dealing with addresses.
   class EditableSetViewContents : public views::View,
                                   public views::DialogDelegate,
                                   public views::ButtonListener,
                                   public views::Textfield::Controller,
                                   public views::Combobox::Listener {
    public:
@@ skipping 11 matching lines @@
                                       views::View* child);
 
     // views::DialogDelegate methods:
     virtual int GetDialogButtons() const;
     virtual std::wstring GetDialogButtonLabel(
       MessageBoxFlags::DialogButton button) const;
     virtual bool IsDialogButtonEnabled(
       MessageBoxFlags::DialogButton button) const;
     virtual bool CanResize() const { return false; }
     virtual bool CanMaximize() const { return false; }
-    virtual bool IsAlwaysOnTop() const { return false; }
+    virtual bool IsModal() const { return true; }

[James Hawkins, 2010/08/09 16:45:49]

What is the impetus for this change?

     virtual bool HasAlwaysOnTopMenu() const { return false; }
     virtual std::wstring GetWindowTitle() const;
     virtual void WindowClosing();
     virtual views::View* GetContentsView();
     virtual bool Cancel();
     virtual bool Accept();
 
     // views::ButtonListener methods:
     virtual void ButtonPressed(views::Button* sender,
-        const views::Event& event);
+                               const views::Event& event);
 
     // views::Textfield::Controller methods:
     virtual void ContentsChanged(views::Textfield* sender,
                                  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_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
+      // Must be last.
       MAX_TEXT_FIELD
     };
 
     void InitAddressFields(views::GridLayout* layout);
     void InitCreditCardFields(views::GridLayout* layout);
     void InitLayoutGrid(views::GridLayout* layout);
     views::Label* CreateLeftAlignedLabel(int label_id);
 
     void UpdateButtons();
 
@@ skipping 30 matching lines @@
     static const int triple_column_fill_view_set_id_ = 2;
     static const int triple_column_leading_view_set_id_ = 3;
     static const int four_column_city_state_zip_set_id_ = 4;
     static const int double_column_ccnumber_cvc_ = 5;
     static const int three_column_header_ = 6;
     static const int double_column_ccexpiration_ = 7;
 
     DISALLOW_COPY_AND_ASSIGN(EditableSetViewContents);
   };
 
-  // Encapsulates ComboboxModel for address
+  // Encapsulates ComboboxModel for address.
   class AddressComboBoxModel : public ComboboxModel {
    public:
     explicit AddressComboBoxModel(bool is_billing);
     virtual ~AddressComboBoxModel() {}
 
     // Should be called only once. No other function should be called before it.
     // Does not own |address_labels|. To update the model text,
     // update label in one of the profiles and call LabelChanged()
     void set_address_labels(const std::vector<EditableSetInfo>* address_labels);
 
     // When you add a CB view that relies on this model, call this function
     // so the CB can be notified if strings change. Can be called multiple
     // 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 item in the model or -1 if not found.
     int GetIndex(int unique_id);
 
-    // ComboboxModel methods, public as they used from EditableSetViewContents
+    // Overridden from ComboboxModel:
+    // Public as they are used from EditableSetViewContents.
     virtual int GetItemCount();
     virtual std::wstring GetItemAt(int index);
 
    private:
     std::list<views::Combobox *> combo_boxes_;
     std::vector<EditableSetInfo> address_labels_;
     bool is_billing_;
 
     DISALLOW_COPY_AND_ASSIGN(AddressComboBoxModel);
   };
 
   class StringVectorComboboxModel : public ComboboxModel {
    public:
     StringVectorComboboxModel() {}
     virtual ~StringVectorComboboxModel() {}
 
     // Sets the vector of the strings for the combobox. Swaps content with
     // |source|.
     void set_cb_strings(std::vector<std::wstring> *source);
 
-    // Return the number of items in the combo box.
+    // Overridden from ComboboxModel:
     virtual int GetItemCount();
-
-    // Return the string that should be used to represent a given item.
     virtual std::wstring GetItemAt(int index);
 
     // Find an index of the item in the model, -1 if not present.
     int GetIndex(const std::wstring& value);
 
    private:
     std::vector<std::wstring> cb_strings_;
 
     DISALLOW_COPY_AND_ASSIGN(StringVectorComboboxModel);
   };
 
-
-  // Model for scrolling credit cards and addresses
+  // Model for scrolling credit cards and addresses.
   class ContentListTableModel : public TableModel {
    public:
     ContentListTableModel(std::vector<EditableSetInfo>* profiles,
                           std::vector<EditableSetInfo>* credit_cards);
     virtual ~ContentListTableModel() {}
 
     // Two constants defined for indexes of groups. The first one is index
     // of Add Address button, the second one is the index of Add Credit Card
     // button.
     static const int kAddressGroup = 1;
@@ skipping 38 matching lines @@
   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_
-