[Extensions Toolbar] Ensure popup is closed at shutdown

chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc

 // Copyright 2014 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/extensions/extension_action_platform_delegate_views.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
@@ skipping 51 matching lines @@
                  notification_source);
   registrar_.Add(this,
                  extensions::NOTIFICATION_EXTENSION_COMMAND_REMOVED,
                  notification_source);
 }
 
 ExtensionActionPlatformDelegateViews::~ExtensionActionPlatformDelegateViews() {
   DCHECK(!popup_);  // We should never have a visible popup at shutdown.
   if (context_menu_owner == this)
     context_menu_owner = nullptr;
+  // Since the popup close process is asynchronous, it might not be fully closed
+  // at shutdown. We still need to cleanup, though.
+  if (popup_)
+    CleanupPopup(true);
   UnregisterCommand(false);
 }
 
 gfx::NativeView ExtensionActionPlatformDelegateViews::GetPopupNativeView() {
   return popup_ ? popup_->GetWidget()->GetNativeView() : nullptr;
 }
 
 bool ExtensionActionPlatformDelegateViews::IsMenuRunning() const {
   return menu_runner_.get() != NULL;
 }
@@ skipping 237 matching lines @@
   if (close_widget)
     popup_->GetWidget()->Close();
   popup_ = nullptr;
 }
 
 ToolbarActionViewDelegateViews*
 ExtensionActionPlatformDelegateViews::GetDelegateViews() const {
   return static_cast<ToolbarActionViewDelegateViews*>(
       controller_->view_delegate());
 }