Implement sidebar support for extension action popups

chrome/browser/ui/extensions/extension_action_view_controller.h

Index: chrome/browser/ui/extensions/extension_action_view_controller.h
diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.h b/chrome/browser/ui/extensions/extension_action_view_controller.h
index 541eef2b83ccbc8b4bbdc2e85e03506ce8024221..7fa70d72925ff12e3ecfa99562c51e81d7d7c70e 100644
--- a/chrome/browser/ui/extensions/extension_action_view_controller.h
+++ b/chrome/browser/ui/extensions/extension_action_view_controller.h
@@ -9,6 +9,7 @@
 #include "base/scoped_observer.h"
 #include "chrome/browser/extensions/extension_action_icon_factory.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
+#include "chrome/browser/extensions/sidebar_manager_observer.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "extensions/browser/extension_host_observer.h"
 #include "ui/gfx/image/image.h"
@@ -35,6 +36,7 @@ class ExtensionActionViewController
     : public ToolbarActionViewController,
       public ExtensionActionIconFactory::Observer,
       public ExtensionContextMenuModel::PopupDelegate,
+      public SidebarManagerObserver,
       public extensions::ExtensionHostObserver {
  public:
   // The different options for showing a popup.
@@ -135,6 +137,17 @@ class ExtensionActionViewController
   // Handles cleanup after the popup closes.
   void OnPopupClosed();
 
+  void OnPopupShown(bool grant_tab_permissions);
+
+  // Handles sidebar events
+  void OnSidebarHidden(content::WebContents* tab,
+                       const std::string& content_id) override;
+
+  void OnSidebarSwitched(content::WebContents* old_tab,
+                         const std::string& old_content_id,
+                         content::WebContents* new_tab,
+                         const std::string& new_content_id) override;
+
   // The extension associated with the action we're displaying.
   scoped_refptr<const extensions::Extension> extension_;
 
@@ -180,6 +193,8 @@ class ExtensionActionViewController
   ScopedObserver<extensions::ExtensionHost, extensions::ExtensionHostObserver>
       popup_host_observer_;
 
+  std::set<content::WebContents*> active_in_webcontents_;
+
   base::WeakPtrFactory<ExtensionActionViewController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionActionViewController);