Make Web Intents picker in Views conform to latest mocks

chrome/browser/ui/views/constrained_window_views.h

Index: chrome/browser/ui/views/constrained_window_views.h
diff --git a/chrome/browser/ui/views/constrained_window_views.h b/chrome/browser/ui/views/constrained_window_views.h
index 97d5b6049c28080bead032b941a0d4f92e7537d6..4345d2b8a363f5afbd13033f971f6bd941a725c0 100644
--- a/chrome/browser/ui/views/constrained_window_views.h
+++ b/chrome/browser/ui/views/constrained_window_views.h
@@ -63,6 +63,10 @@ class ConstrainedWindowViews : public views::Widget,
  public:
   ConstrainedWindowViews(content::WebContents* web_contents,

[Peter Kasting, 2012/10/12 03:23:32]

Seems like we can avoid having two constructors and also avoid the
|custom_client_insets_| bool by simply having one constructor that takes insets
and having people who want no insets pass "gfx::Insets()".  Then we eliminate
the bool and make the code that tests it check client_insets_.empty() instead.

[please use gerrit instead, 2012/10/14 18:40:45]

Done. Since the default insets are not [0,0,0,0], I am going to apply insets to
frameless dialogs always. Other dialogs can use
ConstrainedWindow::GetDefaultInsets().

                          views::WidgetDelegate* widget_delegate,
+                         bool enable_chrome_style,
+                         const gfx::Insets& client_insets);
+  ConstrainedWindowViews(content::WebContents* web_contents,
+                         views::WidgetDelegate* widget_delegate,
                          bool enable_chrome_style);
   virtual ~ConstrainedWindowViews();
 
@@ -79,6 +83,7 @@ class ConstrainedWindowViews : public views::Widget,
   void CenterWindow(const gfx::Size& size);
 
  private:
+  void InitConstrainedWindowViews(views::WidgetDelegate* widget_delegate);
   void NotifyTabHelperWillClose();
 
   // Overridden from views::Widget:
@@ -100,12 +105,18 @@ class ConstrainedWindowViews : public views::Widget,
 
   content::WebContents* web_contents_;
 
-  NativeConstrainedWindow* native_constrained_window_;
-
   // TODO(wittman): remove once all constrained window dialogs are moved
   // over to Chrome style.
   const bool enable_chrome_style_;
 
+  // Whether the window has custom client insets.
+  const bool custom_client_insets_;
+
+  // Custom client insets.
+  const gfx::Insets client_insets_;
+
+  NativeConstrainedWindow* native_constrained_window_;
+
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowViews);
 };