Merge 68814 - Simple fix preventing a potential crash location when shifting ...

chrome/browser/extensions/extension_popup_api.cc

 // Copyright (c) 2010 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/extensions/extension_popup_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
@@ skipping 224 matching lines @@
   // Overridden from views::WidgetFocusChangeListener
   virtual void NativeFocusWillChange(gfx::NativeView focused_before,
                                      gfx::NativeView focused_now) {
     // If the popup doesn't exist, then do nothing.
     if (!popup_)
       return;
 
     // If no view is to be focused, then Chrome was deactivated, so hide the
     // popup.
     if (focused_now) {
+      // On XP, the focus change handler may be invoked when the delegate has
+      // already been revoked.
+      // TODO(twiz@chromium.org):  Resolve the trigger of this behaviour.
+      if (!dispatcher_ || !dispatcher_->delegate())
+        return;
+
       gfx::NativeView host_view =
           dispatcher_->delegate()->GetNativeViewOfHost();
 
       // If the widget hosting the popup contains the newly focused view, then
       // don't dismiss the pop-up.
       ExtensionView* view = popup_->host()->view();
       if (view) {
         views::Widget* popup_root_widget = view->GetWidget();
         if (popup_root_widget &&
             popup_root_widget->ContainsNativeView(focused_now))
@@ skipping 284 matching lines @@
 // static
 void PopupEventRouter::OnPopupClosed(Profile* profile,
                                      int routing_id) {
   std::string full_event_name = base::StringPrintf(
       extension_popup_module_events::kOnPopupClosed,
       routing_id);
 
   profile->GetExtensionEventRouter()->DispatchEventToRenderers(
       full_event_name, base::JSONWriter::kEmptyArray, profile, GURL());
 }