Make Web Intents picker in Views conform to latest mocks

chrome/browser/ui/views/constrained_window_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_CONSTRAINED_WINDOW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_CONSTRAINED_WINDOW_VIEWS_H_
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/ui/constrained_window.h"
 #include "content/public/browser/web_contents_observer.h"
@@ skipping 43 matching lines @@
 //
 //  A ConstrainedWindow implementation that implements a Constrained Window as
 //  a child HWND with a custom window frame. The ConstrainedWindowViews owns
 //  itself and will be deleted soon after being closed.
 //
 class ConstrainedWindowViews : public views::Widget,
                                public ConstrainedWindow,
                                public NativeConstrainedWindowDelegate,
                                public content::WebContentsObserver {
  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();
 
   // Returns the WebContents that constrains this Constrained Window.
   content::WebContents* owner() const { return web_contents_; }
 
   // Overridden from ConstrainedWindow:
   virtual void ShowConstrainedWindow() OVERRIDE;
   virtual void CloseConstrainedWindow() OVERRIDE;
   virtual void FocusConstrainedWindow() OVERRIDE;
   virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
 
   // Overridden from views::Widget:
   void CenterWindow(const gfx::Size& size);
 
  private:
+  void InitConstrainedWindowViews(views::WidgetDelegate* widget_delegate);
   void NotifyTabHelperWillClose();
 
   // Overridden from views::Widget:
   virtual views::NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
 
   // Overridden from NativeConstrainedWindowDelegate:
   virtual void OnNativeConstrainedWindowDestroyed() OVERRIDE;
   virtual void OnNativeConstrainedWindowMouseActivate() OVERRIDE;
   virtual views::internal::NativeWidgetDelegate*
       AsNativeWidgetDelegate() OVERRIDE;
   virtual int GetNonClientComponent(const gfx::Point& point) OVERRIDE;
 
   // Set the top of the window to overlap the browser chrome.
   void PositionChromeStyleWindow();
 
   // Overridden from content::WebContentsObserver:
   virtual void WebContentsDestroyed(content::WebContents* web_contents)
       OVERRIDE;
 
   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);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_CONSTRAINED_WINDOW_VIEWS_H_