Fix crash in TabContentsViewViews::Focus. This was caused by r125126. The subtle bug is that the Sa…

chrome/browser/ui/sad_tab_helper.cc

 // Copyright (c) 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/sad_tab_helper.h"
 
 #include "chrome/browser/browser_shutdown.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 39 matching lines @@
 void SadTabHelper::Observe(int type,
                            const content::NotificationSource& source,
                            const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_WEB_CONTENTS_CONNECTED:
       if (HasSadTab()) {
 #if defined(OS_MACOSX)
         sad_tab_controller_mac::RemoveSadTab(sad_tab_.get());
 #elif defined(TOOLKIT_VIEWS)
         sad_tab_->Close();
+        // See http://crbug.com/117668. When the Widget is being destructed, we
+        // want calls to sad_tab() to return NULL.
+        scoped_ptr<views::Widget> local_sad_tab;
+        local_sad_tab.swap(sad_tab_);
 #elif defined(TOOLKIT_GTK)
         GtkWidget* expanded_container =
             ChromeWebContentsViewDelegateGtk::GetFor(web_contents())->
                 expanded_container();
         gtk_container_remove(
             GTK_CONTAINER(expanded_container), sad_tab_->widget());
 #else
 #error Unknown platform
 #endif
         sad_tab_.reset();
@@ skipping 42 matching lines @@
   gtk_container_add(GTK_CONTAINER(expanded_container), sad_tab_->widget());
   gtk_widget_show(sad_tab_->widget());
 #else
 #error Unknown platform
 #endif
 }
 
 bool SadTabHelper::HasSadTab() {
   return sad_tab_.get() != NULL;
 }