Make Web Intents picker in Views conform to latest mocks

chrome/browser/ui/views/constrained_window_frame_simple.h

Index: chrome/browser/ui/views/constrained_window_frame_simple.h
diff --git a/chrome/browser/ui/views/constrained_window_frame_simple.h b/chrome/browser/ui/views/constrained_window_frame_simple.h
index 3a141a558150a93dce89a80077f7257dd5cadcab..552408c58720ea1a0a46d4b513d4543db2d5a5a1 100644
--- a/chrome/browser/ui/views/constrained_window_frame_simple.h
+++ b/chrome/browser/ui/views/constrained_window_frame_simple.h
@@ -6,15 +6,13 @@
 #define CHROME_BROWSER_UI_VIEWS_CONSTRAINED_WINDOW_FRAME_SIMPLE_H_
 
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/ui/views/constrained_window_views.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/window/non_client_view.h"
 
-class ConstrainedWindowViews;
-
 namespace views {
 class ImageButton;
 class Label;
-class LayoutManager;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -24,24 +22,11 @@ class LayoutManager;
 class ConstrainedWindowFrameSimple : public views::NonClientFrameView,
                                      public views::ButtonListener {
  public:
-  // Contains references to relevant views in the header.  The header
-  // must be non-NULL.
-  struct HeaderViews {
-    HeaderViews(views::View* header,
-                views::Label* title_label,
-                views::Button* close_button);
-
-    views::View* header;
-    views::Label* title_label;
-    views::Button* close_button;
-  };
-
-  explicit ConstrainedWindowFrameSimple(ConstrainedWindowViews* container);
+  explicit ConstrainedWindowFrameSimple(
+      ConstrainedWindowViews* container,
+      ConstrainedWindowViews::ChromeStyleClientInsets client_insets);
   virtual ~ConstrainedWindowFrameSimple();
 
-  // SetHeaderView assumes ownership of the passed parameter.
-  void SetHeaderView(HeaderViews* header_views);
-
  private:
   // Overridden from views::NonClientFrameView:
   virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
@@ -61,15 +46,9 @@ class ConstrainedWindowFrameSimple : public views::NonClientFrameView,
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
-  HeaderViews* CreateDefaultHeaderView();
-
-  views::ImageButton* CreateCloseButton();
-
   ConstrainedWindowViews* container_;
-
-  views::LayoutManager* layout_;
-
-  scoped_ptr<HeaderViews> header_views_;
+  views::Label* title_label_;
+  views::ImageButton* close_button_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowFrameSimple);
 };