Move Sad Tab implementation out of the TabContentsViews.

chrome/browser/ui/views/tab_contents/tab_contents_view_views.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/ui/views/tab_contents/tab_contents_view_views.h"
 
 #include <vector>
 
 #include "base/time.h"
-#include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/ui/constrained_window.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/ui/views/sad_tab_view.h"
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view.h"
 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h"
 #include "content/browser/renderer_host/render_process_host.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.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 "ui/gfx/screen.h"
 #include "views/focus/focus_manager.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/native_widget.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationNone;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebInputEvent;
 
 TabContentsViewViews::TabContentsViewViews(TabContents* tab_contents)
     : tab_contents_(tab_contents),
       native_tab_contents_view_(NULL),
-      sad_tab_widget_(NULL),
       close_tab_after_drag_ends_(false),
-      focus_manager_(NULL) {
+      focus_manager_(NULL),
+      overlaid_view_(NULL) {
   last_focused_view_storage_id_ =
       views::ViewStorage::GetInstance()->CreateStorageID();
 }
 
 TabContentsViewViews::~TabContentsViewViews() {
   // Makes sure to remove any stored view we may still have in the ViewStorage.
   //
   // It is possible the view went away before us, so we only do this if the
   // view is registered.
   views::ViewStorage* view_storage = views::ViewStorage::GetInstance();
@@ skipping 27 matching lines @@
   if (render_widget_host->view()) {
     // During testing, the view will already be set up in most cases to the
     // test view, so we don't want to clobber it with a real one. To verify that
     // this actually is happening (and somebody isn't accidentally creating the
     // view twice), we check for the RVH Factory, which will be set when we're
     // making special ones (which go along with the special views).
     DCHECK(RenderViewHostFactory::has_factory());
     return render_widget_host->view();
   }
 
-  // If we were showing sad tab, remove it now.
-  if (sad_tab_widget_) {
-    sad_tab_widget_->Close();
-    sad_tab_widget_ = NULL;
-  }
-
   return native_tab_contents_view_->CreateRenderWidgetHostView(
       render_widget_host);
 }
 
 gfx::NativeView TabContentsViewViews::GetNativeView() const {
   return Widget::GetNativeView();
 }
 
 gfx::NativeView TabContentsViewViews::GetContentNativeView() const {
   RenderWidgetHostView* rwhv = tab_contents_->GetRenderWidgetHostView();
@@ skipping 15 matching lines @@
                                          const gfx::Point& image_offset) {
   native_tab_contents_view_->StartDragging(drop_data, ops, image, image_offset);
 }
 
 void TabContentsViewViews::SetPageTitle(const string16& title) {
   native_tab_contents_view_->SetPageTitle(title);
 }
 
 void TabContentsViewViews::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;
-
-  // Note that it's possible to get this message after the window was destroyed.
-  if (GetNativeView()) {
-    SadTabView::Kind kind =
-        status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED ?
-        SadTabView::KILLED : SadTabView::CRASHED;
-    views::Widget::InitParams sad_tab_widget_params(
-        views::Widget::InitParams::TYPE_CONTROL);
-    sad_tab_widget_params.parent_widget = this;
-    sad_tab_widget_params.bounds =
-        gfx::Rect(GetClientAreaScreenBounds().size());
-    sad_tab_widget_ = new views::Widget;
-    sad_tab_widget_->Init(sad_tab_widget_params);
-    sad_tab_widget_->SetContentsView(new SadTabView(tab_contents_, kind));
-  }
 }
 
 void TabContentsViewViews::SizeContents(const gfx::Size& size) {
   gfx::Rect bounds;
   GetContainerBounds(&bounds);
   if (bounds.size() != size) {
     SetSize(size);
   } else {
     // Our size matches what we want but the renderers size may not match.
     // Pretend we were resized so that the renderers size is updated too.
     OnNativeTabContentsViewSized(size);
   }
 }
 
 void TabContentsViewViews::RenderViewCreated(RenderViewHost* host) {
 }
 
 void TabContentsViewViews::Focus() {
   if (tab_contents_->interstitial_page()) {
     tab_contents_->interstitial_page()->Focus();
     return;
   }
 
-  if (tab_contents_->is_crashed() && sad_tab_widget_ != NULL) {
-    sad_tab_widget_->GetContentsView()->RequestFocus();
+  if (overlaid_view_) {
+    overlaid_view_->GetContentsView()->RequestFocus();
     return;
   }
 
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_);
   if (wrapper) {
     // TODO(erg): TabContents used to own constrained windows, which is why
     // this is here. Eventually this should be ported to a containing view
     // specializing in constrained window management.
     ConstrainedWindowTabHelper* helper =
@@ skipping 90 matching lines @@
   return false;
 }
 
 void TabContentsViewViews::CloseTabAfterEventTracking() {
 }
 
 void TabContentsViewViews::GetViewBounds(gfx::Rect* out) const {
   *out = GetWindowScreenBounds();
 }
 
+void TabContentsViewViews::InstallOverlayView(gfx::NativeView view) {
+  DCHECK(!overlaid_view_);
+  views::Widget::ReparentNativeView(view, GetNativeView());
+  overlaid_view_ = views::Widget::GetWidgetForNativeView(view);
+  overlaid_view_->SetBounds(gfx::Rect(GetClientAreaScreenBounds().size()));
+}
+
+void TabContentsViewViews::RemoveOverlayView() {
+  DCHECK(overlaid_view_);
+  overlaid_view_->Close();
+  overlaid_view_ = NULL;
+}
+
 void TabContentsViewViews::UpdateDragCursor(WebDragOperation operation) {
   native_tab_contents_view_->SetDragCursor(operation);
 }
 
 void TabContentsViewViews::GotFocus() {
   if (tab_contents_->delegate())
     tab_contents_->delegate()->TabContentsFocused(tab_contents_);
 }
 
 void TabContentsViewViews::TakeFocus(bool reverse) {
@@ skipping 80 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsViewViews, internal::NativeTabContentsViewDelegate implementation:
 
 TabContents* TabContentsViewViews::GetTabContents() {
   return tab_contents_;
 }
 
 bool TabContentsViewViews::IsShowingSadTab() const {
-  return tab_contents_->is_crashed() && sad_tab_widget_;
+  return tab_contents_->is_crashed() && overlaid_view_;
 }
 
 void TabContentsViewViews::OnNativeTabContentsViewShown() {
   tab_contents_->ShowContents();
 }
 
 void TabContentsViewViews::OnNativeTabContentsViewHidden() {
   tab_contents_->HideContents();
 }
 
@@ skipping 66 matching lines @@
   views::Widget::OnNativeWidgetVisibilityChanged(visible);
   if (visible) {
     tab_contents_->ShowContents();
   } else {
     tab_contents_->HideContents();
   }
 }
 
 void TabContentsViewViews::OnNativeWidgetSizeChanged(
     const gfx::Size& new_size) {
-  if (sad_tab_widget_)
-    sad_tab_widget_->SetBounds(gfx::Rect(new_size));
+  if (overlaid_view_)
+    overlaid_view_->SetBounds(gfx::Rect(new_size));
   views::Widget::OnNativeWidgetSizeChanged(new_size);
 }