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..5f084e093d226a8f36f434a742d7a410d16bfdf8 100644
--- a/chrome/browser/ui/views/constrained_window_frame_simple.h
+++ b/chrome/browser/ui/views/constrained_window_frame_simple.h
@@ -14,7 +14,6 @@ class ConstrainedWindowViews;
 namespace views {
 class ImageButton;
 class Label;
-class LayoutManager;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -24,24 +23,9 @@ 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);
   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;
@@ -53,6 +37,7 @@ class ConstrainedWindowFrameSimple : public views::NonClientFrameView,
   virtual void ResetWindowControls() OVERRIDE;
   virtual void UpdateWindowIcon() OVERRIDE;
   virtual void UpdateWindowTitle() OVERRIDE;
+  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
@@ -61,15 +46,13 @@ class ConstrainedWindowFrameSimple : public views::NonClientFrameView,
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
-  HeaderViews* CreateDefaultHeaderView();
-
-  views::ImageButton* CreateCloseButton();
-
   ConstrainedWindowViews* container_;
 

[Peter Kasting, 2012/10/15 21:46:54]

Tiny nit: If none of these members have comments, I'd eliminate the blank lines
between them.

[please use gerrit instead, 2012/10/16 00:12:23]

Done.

-  views::LayoutManager* layout_;
+  views::View* header_;
+
+  views::Label* title_label_;
 
-  scoped_ptr<HeaderViews> header_views_;
+  views::ImageButton* close_button_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowFrameSimple);
 };