Revert 162252 - 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
===================================================================
--- chrome/browser/ui/views/constrained_window_views.h	(revision 162255)
+++ chrome/browser/ui/views/constrained_window_views.h	(working copy)
@@ -7,8 +7,6 @@
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/ui/constrained_window.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
@@ -61,19 +59,11 @@
 class ConstrainedWindowViews : public views::Widget,
                                public ConstrainedWindow,
                                public NativeConstrainedWindowDelegate,
-                               public content::WebContentsObserver,
-                               public content::NotificationObserver {
+                               public content::WebContentsObserver {
  public:
-  // Types of insets to use with chrome style frame.
-  enum ChromeStyleClientInsets {
-    DEFAULT_INSETS,
-    NO_INSETS,
-  };
-
   ConstrainedWindowViews(content::WebContents* web_contents,
                          views::WidgetDelegate* widget_delegate,
-                         bool enable_chrome_style,
-                         ChromeStyleClientInsets chrome_style_client_insets);
+                         bool enable_chrome_style);
   virtual ~ConstrainedWindowViews();
 
   // Returns the WebContents that constrains this Constrained Window.
@@ -88,9 +78,6 @@
   // Overridden from views::Widget:
   void CenterWindow(const gfx::Size& size);
 
-  // Default insets for the dialog:
-  static gfx::Insets GetDefaultInsets();
-
  private:
   void NotifyTabHelperWillClose();
 
@@ -104,30 +91,21 @@
       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;
 
-  // Overridden from content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
-  // Set the top of the window to overlap the browser chrome.
-  void PositionChromeStyleWindow(const gfx::Size& size);
-
-  content::NotificationRegistrar registrar_;
   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_;
 
-  // Client insets to use when |enable_chrome_style_| is true.
-  ChromeStyleClientInsets chrome_style_client_insets_;
-
-  NativeConstrainedWindow* native_constrained_window_;
-
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowViews);
 };