Remove the WebContentsModalDialog interface

This CL is part 6 of 6 in the work to remove the WebContentsModalDialog
interface.  Now that all references to WebContentsModalDialog are
gone, we can remove the class and the inheritance of the class by the
platform-specific UI code.

This builds on part 5 in https://codereview.chromium.org/12283024. 

BUG=157161


Review URL: https://chromiumcodereview.appspot.com/12288018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184589 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 13 deletions

diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.h b/chrome/browser/ui/gtk/constrained_window_gtk.h
index 9646665..8ba9e75 100644
--- a/chrome/browser/ui/gtk/constrained_window_gtk.h
+++ b/chrome/browser/ui/gtk/constrained_window_gtk.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/ui/web_contents_modal_dialog.h"
+#include "chrome/browser/ui/native_web_contents_modal_dialog.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 
@@ -26,7 +26,7 @@ class ConstrainedWindowGtkDelegate {
   // Returns the widget that will be put in the constrained window's container.
   virtual GtkWidget* GetWidgetRoot() = 0;
 
-  // Returns the widget that should get focus when WebContentsModalDialog is
+  // Returns the widget that should get focus when ConstrainedWindowGtk is
   // focused.
   virtual GtkWidget* GetFocusWidget() = 0;
 
@@ -43,10 +43,10 @@ class ConstrainedWindowGtkDelegate {
   virtual ~ConstrainedWindowGtkDelegate();
 };
 
-// WebContentsModalDialog implementation for the GTK port. Unlike the Win32
+// Web contents modal dialog implementation for the GTK port. Unlike the Win32
 // system, ConstrainedWindowGtk doesn't draw draggable fake windows and instead
 // just centers the dialog. It is thus an order of magnitude simpler.
-class ConstrainedWindowGtk : public WebContentsModalDialog {
+class ConstrainedWindowGtk {
  public:
   typedef ChromeWebContentsViewDelegateGtk TabContentsViewType;
 
@@ -54,12 +54,11 @@ class ConstrainedWindowGtk : public WebContentsModalDialog {
                        ConstrainedWindowGtkDelegate* delegate);
   virtual ~ConstrainedWindowGtk();
 
-  // Overridden from WebContentsModalDialog:
-  virtual void ShowWebContentsModalDialog() OVERRIDE;
-  virtual void CloseWebContentsModalDialog() OVERRIDE;
-  virtual void FocusWebContentsModalDialog() OVERRIDE;
-  virtual void PulseWebContentsModalDialog() OVERRIDE;
-  virtual NativeWebContentsModalDialog GetNativeDialog() OVERRIDE;
+  void ShowWebContentsModalDialog();
+  void CloseWebContentsModalDialog();
+  void FocusWebContentsModalDialog();
+  void PulseWebContentsModalDialog();
+  NativeWebContentsModalDialog GetNativeDialog();
 
   // Called when the result of GetBackgroundColor may have changed.
   void BackgroundColorChanged();
@@ -74,15 +73,13 @@ class ConstrainedWindowGtk : public WebContentsModalDialog {
   TabContentsViewType* ContainingView();
 
  private:
-  friend class WebContentsModalDialog;
-
   // Signal callbacks.
   CHROMEGTK_CALLBACK_1(ConstrainedWindowGtk, gboolean, OnKeyPress,
                        GdkEventKey*);
   CHROMEGTK_CALLBACK_1(ConstrainedWindowGtk, void, OnHierarchyChanged,
                        GtkWidget*);
 
-  // The WebContents that owns and constrains this WebContentsModalDialog.
+  // The WebContents that owns and constrains this ConstrainedWindowGtk.
   content::WebContents* web_contents_;
 
   // The top level widget container that exports to our WebContentsView.