Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/autofill/autofill_dialog_views.h

 // Copyright (c) 2012 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_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEWS_H_
 
 #include <map>
 #include <set>
 
@@ skipping 86 matching lines @@
   virtual void OnSignInResize(const gfx::Size& pref_size) OVERRIDE;
   virtual void ValidateSection(DialogSection section) OVERRIDE;
 
   // views::View implementation.
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual gfx::Size GetMinimumSize() const OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE;
 
   // views::DialogDelegate implementation:
+  virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual base::string16 GetWindowTitle() const OVERRIDE;
   virtual void WindowClosing() OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
   virtual views::View* CreateOverlayView() OVERRIDE;
   virtual int GetDialogButtons() const OVERRIDE;
   virtual int GetDefaultDialogButton() const OVERRIDE;
   virtual base::string16 GetDialogButtonLabel(ui::DialogButton button) const
       OVERRIDE;
   virtual bool ShouldDefaultButtonBeBlue() const OVERRIDE;
   virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
@@ skipping 434 matching lines @@
   // focused), this function will inform the delegate to take the appropriate
   // action (textfields may show a suggestion popup, comboboxes may rebuild the
   // section inputs). May also reset the validity state of the input.
   void InputEditedOrActivated(ServerFieldType type,
                               const gfx::Rect& bounds,
                               bool was_edit);
 
   // Updates the views in the button strip.
   void UpdateButtonStripExtraView();
 
-  // Call this when the size of anything in |contents_| might've changed.
+  // Call this when the size of anything in the contents might have changed.
   void ContentsPreferredSizeChanged();
   void DoContentsPreferredSizeChanged();
 
   // Gets the textfield view that is shown for the given |type| or NULL.
   ExpandingTextfield* TextfieldForType(ServerFieldType type);
 
   // Returns the associated ServerFieldType for |textfield|.
   ServerFieldType TypeForTextfield(const views::View* textfield);
 
   // Gets the combobox view that is shown for the given |type|, or NULL.
@@ skipping 22 matching lines @@
   // The preferred size of the view, cached to avoid needless recomputation.
   mutable gfx::Size preferred_size_;
 
   // The current number of unmatched calls to UpdatesStarted.
   int updates_scope_;
 
   // True when there's been a call to ContentsPreferredSizeChanged() suppressed
   // due to an unmatched UpdatesStarted.
   bool needs_update_;
 
-  // The window that displays |contents_|. Weak pointer; may be NULL when the
-  // dialog is closing.
+  // The window that displays the dialog contents. Weak pointer; may be NULL
+  // when the dialog is closing.
   views::Widget* window_;
 
   // A DialogSection-keyed map of the DetailGroup structs.
   DetailGroupMap detail_groups_;
 
   // Somewhere to show notification messages about errors, warnings, or promos.
   NotificationArea* notification_area_;
 
   // Runs the suggestion menu (triggered by each section's |suggested_button|.
   scoped_ptr<views::MenuRunner> menu_runner_;
@@ skipping 61 matching lines @@
 
   // Used to tell the delegate when focus moves to hide the Autofill popup.
   scoped_ptr<ui::EventHandler> event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogViews);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEWS_H_