Move Sad Tab implementation out of the TabContentsViews.

chrome/browser/tab_contents/tab_contents_view_gtk.cc

 // Copyright (c) 2011 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/tab_contents/tab_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/tab_contents/render_view_context_menu_gtk.h"
 #include "chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.h"
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
-#include "chrome/browser/ui/gtk/sad_tab_gtk.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/tab_contents/web_drag_dest_gtk.h"
 #include "content/browser/tab_contents/web_drag_source_gtk.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
 #include "ui/base/gtk/gtk_expanded_container.h"
 #include "ui/base/gtk/gtk_floating_container.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/webdropdata.h"
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 
@@ skipping 33 matching lines @@
 
   return FALSE;
 }
 
 }  // namespace
 
 TabContentsViewGtk::TabContentsViewGtk(TabContents* tab_contents)
     : tab_contents_(tab_contents),
       floating_(gtk_floating_container_new()),
       expanded_(gtk_expanded_container_new()),
-      constrained_window_(NULL) {
+      constrained_window_(NULL),
+      overlaid_view_(NULL) {
   gtk_widget_set_name(expanded_, "chrome-tab-contents-view");
   g_signal_connect(expanded_, "size-allocate",
                    G_CALLBACK(OnSizeAllocateThunk), this);
   g_signal_connect(expanded_, "child-size-request",
                    G_CALLBACK(OnChildSizeRequestThunk), this);
   g_signal_connect(floating_.get(), "set-floating-position",
                    G_CALLBACK(OnSetFloatingPositionThunk), this);
 
   gtk_container_add(GTK_CONTAINER(floating_.get()), expanded_);
   gtk_widget_show(expanded_);
   gtk_widget_show(floating_.get());
-  registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_CONNECTED,
-                 content::Source<TabContents>(tab_contents));
   drag_source_.reset(new content::WebDragSourceGtk(tab_contents));
 }
 
 TabContentsViewGtk::~TabContentsViewGtk() {
   floating_.Destroy();
 }
 
 void TabContentsViewGtk::AttachConstrainedWindow(
     ConstrainedWindowGtk* constrained_window) {
   DCHECK(constrained_window_ == NULL);
@@ skipping 83 matching lines @@
 void TabContentsViewGtk::SetPageTitle(const string16& title) {
   // Set the window name to include the page title so it's easier to spot
   // when debugging (e.g. via xwininfo -tree).
   gfx::NativeView content_view = GetContentNativeView();
   if (content_view && content_view->window)
     gdk_window_set_title(content_view->window, UTF16ToUTF8(title).c_str());
 }
 
 void TabContentsViewGtk::OnTabCrashed(base::TerminationStatus status,
                                       int error_code) {
-  // Only show the sad tab if we're not in browser shutdown, so that TabContents
-  // objects that are not in a browser (e.g., HTML dialogs) and thus are
-  // visible do not flash a sad tab page.
-  if (browser_shutdown::GetShutdownType() != browser_shutdown::NOT_VALID)
-    return;
-
-  if (tab_contents_ != NULL && !sad_tab_.get()) {
-    sad_tab_.reset(new SadTabGtk(
-        tab_contents_,
-        status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED ?
-        SadTabGtk::KILLED : SadTabGtk::CRASHED));
-    InsertIntoContentArea(sad_tab_->widget());
-    gtk_widget_show(sad_tab_->widget());
-  }
 }
 
 void TabContentsViewGtk::SizeContents(const gfx::Size& size) {
   // We don't need to manually set the size of of widgets in GTK+, but we do
   // need to pass the sizing information on to the RWHV which will pass the
   // sizing information on to the renderer.
   requested_size_ = size;
   RenderWidgetHostView* rwhv = tab_contents_->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetSize(size);
@@ skipping 47 matching lines @@
 void TabContentsViewGtk::GetViewBounds(gfx::Rect* out) const {
   if (!floating_->window) {
     out->SetRect(0, 0, requested_size_.width(), requested_size_.height());
     return;
   }
   int x = 0, y = 0, w, h;
   gdk_window_get_geometry(floating_->window, &x, &y, &w, &h, NULL);
   out->SetRect(x, y, w, h);
 }
 
+void TabContentsViewGtk::InstallOverlayView(gfx::NativeView view) {
+  DCHECK(!overlaid_view_);
+  overlaid_view_ = view;
+  InsertIntoContentArea(view);
+  gtk_widget_show(view);
+}
+
+void TabContentsViewGtk::RemoveOverlayView() {
+  DCHECK(overlaid_view_);
+  gtk_container_remove(GTK_CONTAINER(expanded_), overlaid_view_);
+  overlaid_view_ = NULL;
+}
+
 void TabContentsViewGtk::SetFocusedWidget(GtkWidget* widget) {
   focus_store_.SetWidget(widget);
 }
 
 void TabContentsViewGtk::UpdateDragCursor(WebDragOperation operation) {
   drag_dest_->UpdateDragStatus(operation);
 }
 
 void TabContentsViewGtk::GotFocus() {
   // This is only used in the views FocusManager stuff but it bleeds through
   // all subclasses. http://crbug.com/21875
 }
 
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void TabContentsViewGtk::TakeFocus(bool reverse) {
   if (!tab_contents_->delegate()->TakeFocus(reverse)) {
     gtk_widget_child_focus(GTK_WIDGET(GetTopLevelNativeWindow()),
         reverse ? GTK_DIR_TAB_BACKWARD : GTK_DIR_TAB_FORWARD);
   }
 }
 
-void TabContentsViewGtk::Observe(int type,
-                                 const content::NotificationSource& source,
-                                 const content::NotificationDetails& details) {
-  switch (type) {
-    case content::NOTIFICATION_TAB_CONTENTS_CONNECTED: {
-      // No need to remove the SadTabGtk's widget from the container since
-      // the new RenderWidgetHostViewGtk instance already removed all the
-      // vbox's children.
-      sad_tab_.reset();
-      break;
-    }
-    default:
-      NOTREACHED() << "Got a notification we didn't register for.";
-      break;
-  }
-}
-
-
 void TabContentsViewGtk::CreateNewWindow(
     int route_id,
     const ViewHostMsg_CreateWindow_Params& params) {
   delegate_view_helper_.CreateNewWindowFromTabContents(
       tab_contents_, route_id, params);
 }
 
 void TabContentsViewGtk::CreateNewWidget(
     int route_id, WebKit::WebPopupType popup_type) {
   delegate_view_helper_.CreateNewWidget(route_id, popup_type,
@@ skipping 171 matching lines @@
   g_value_set_int(&value, child_x);
   gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                    widget, "x", &value);
 
   int child_y = std::max((allocation->height - requisition.height) / 2, 0);
   g_value_set_int(&value, child_y);
   gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                    widget, "y", &value);
   g_value_unset(&value);
 }