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

chrome/browser/extensions/extension_popup_api.cc

Index: chrome/browser/extensions/extension_popup_api.cc
===================================================================
--- chrome/browser/extensions/extension_popup_api.cc	(revision 68816)
+++ chrome/browser/extensions/extension_popup_api.cc	(working copy)
@@ -242,6 +242,12 @@
     // 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();