Remove ConstrainedWindowGtkDelegate

chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc

 // Copyright 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.
 
 #include "chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h"
 
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 30 matching lines @@
 
  private:
   GtkWidget* window_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateGtk);
 };
 
 }  // namespace
 
 class ConstrainedWebDialogDelegateViewGtk
-    : public ConstrainedWindowGtkDelegate,
-      public ConstrainedWebDialogDelegate {
+    : public ConstrainedWebDialogDelegate {
  public:
   ConstrainedWebDialogDelegateViewGtk(
       content::BrowserContext* browser_context,
       WebDialogDelegate* delegate,
       WebDialogWebContentsDelegate* tab_delegate);
 
   virtual ~ConstrainedWebDialogDelegateViewGtk() {}
 
   // ConstrainedWebDialogDelegate interface
   virtual const WebDialogDelegate*
       GetWebDialogDelegate() const OVERRIDE {
     return impl_->GetWebDialogDelegate();
   }
   virtual WebDialogDelegate* GetWebDialogDelegate() OVERRIDE {
     return impl_->GetWebDialogDelegate();
   }
   virtual void OnDialogCloseFromWebUI() OVERRIDE {
     return impl_->OnDialogCloseFromWebUI();
   }
   virtual void ReleaseWebContentsOnDialogClose() OVERRIDE {
     return impl_->ReleaseWebContentsOnDialogClose();
   }
   virtual NativeWebContentsModalDialog GetNativeDialog() OVERRIDE {
     return impl_->window();
   }
   virtual WebContents* GetWebContents() OVERRIDE {
     return impl_->GetWebContents();
   }
 
-  // ConstrainedWindowGtkDelegate interface
-  virtual GtkWidget* GetWidgetRoot() OVERRIDE {
-    return GetWebContents()->GetView()->GetNativeView();
-  }
-  virtual GtkWidget* GetFocusWidget() OVERRIDE {
-    return GetWebContents()->GetView()->GetContentNativeView();
-  }
-  virtual void DeleteDelegate() OVERRIDE {
-    if (!impl_->closed_via_webui())
-      GetWebDialogDelegate()->OnDialogClosed("");
-    delete this;
-  }
-  virtual bool GetBackgroundColor(GdkColor* color) OVERRIDE {
-    *color = ui::kGdkWhite;
-    return true;
-  }
-
   void SetWindow(GtkWidget* window) {
     impl_->set_window(window);
   }
 
   GtkWidget* GetWindow() {
     return impl_->window();
   }
 
  private:
+  CHROMEGTK_CALLBACK_0(ConstrainedWebDialogDelegateViewGtk, void, OnDestroy);
+
   scoped_ptr<ConstrainedWebDialogDelegateGtk> impl_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateViewGtk);
 };
 
 ConstrainedWebDialogDelegateViewGtk::ConstrainedWebDialogDelegateViewGtk(
     content::BrowserContext* browser_context,
     WebDialogDelegate* delegate,
     WebDialogWebContentsDelegate* tab_delegate)
     : impl_(new ConstrainedWebDialogDelegateGtk(
           browser_context,
           delegate,
           tab_delegate)) {
   gfx::Size dialog_size;
   delegate->GetDialogSize(&dialog_size);
-  gtk_widget_set_size_request(GTK_WIDGET(GetWidgetRoot()),
+  GtkWidget* contents =
+      GTK_WIDGET(GetWebContents()->GetView()->GetNativeView());
+  gtk_widget_set_size_request(contents,
                               dialog_size.width(),
                               dialog_size.height());
 
-  gtk_widget_show_all(GetWidgetRoot());
+  gtk_widget_show_all(contents);
+
+  g_signal_connect(contents, "destroy", G_CALLBACK(OnDestroyThunk), this);
 }
 
+void ConstrainedWebDialogDelegateViewGtk::OnDestroy(GtkWidget* widget) {
+  if (!impl_->closed_via_webui())
+    GetWebDialogDelegate()->OnDialogClosed("");
+  delete this;
+}
+
+namespace {
+void SetBackgroundColor(GtkWidget* widget, const GdkColor &color) {

[Elliot Glaysher, 2013/03/13 23:48:10]

This should go in the existing anonymous namespace at the top of the file.

[Mike Wittman, 2013/03/14 00:34:48]

Done.

+  gtk_widget_modify_base(widget, GTK_STATE_NORMAL, &color);
+  gtk_widget_modify_fg(widget, GTK_STATE_NORMAL, &color);
+  gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, &color);
+}
+}  // namespace
+
 ConstrainedWebDialogDelegate* CreateConstrainedWebDialog(
       content::BrowserContext* browser_context,
       WebDialogDelegate* delegate,
       WebDialogWebContentsDelegate* tab_delegate,
       content::WebContents* web_contents) {
   ConstrainedWebDialogDelegateViewGtk* constrained_delegate =
       new ConstrainedWebDialogDelegateViewGtk(
           browser_context, delegate, tab_delegate);
   GtkWidget* window =
-      CreateWebContentsModalDialogGtk(web_contents, constrained_delegate);
+      CreateWebContentsModalDialogGtk(
+          web_contents,
+          constrained_delegate->GetWebContents()->GetView()->GetNativeView(),
+          constrained_delegate->GetWebContents()->GetView()->
+              GetContentNativeView());
+  SetBackgroundColor(window, ui::kGdkWhite);
   constrained_delegate->SetWindow(window);
 
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   web_contents_modal_dialog_manager->ShowDialog(window);
 
   return constrained_delegate;
 }