Test ActiveTab

chrome/browser/ui/views/browser_actions_container.cc

Index: chrome/browser/ui/views/browser_actions_container.cc
===================================================================
--- chrome/browser/ui/views/browser_actions_container.cc	(revision 155251)
+++ chrome/browser/ui/views/browser_actions_container.cc	(working copy)
@@ -4,8 +4,10 @@
 
 #include "chrome/browser/ui/views/browser_actions_container.h"
 
+#include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
@@ -15,6 +17,7 @@
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/browser_action_view.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
+#include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/pref_names.h"
@@ -68,8 +71,6 @@
       container_width_(0),
       chevron_(NULL),
       overflow_menu_(NULL),
-      extension_keybinding_registry_(browser->profile(),
-                                     owner_view->GetFocusManager()),
       suppress_chevron_(false),
       resize_amount_(0),
       animation_target_size_(0),
@@ -83,6 +84,9 @@
     model_->AddObserver(this);
   }
 
+  extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews(
+    browser->profile(), this, owner_view->GetFocusManager()));
+
   resize_animation_.reset(new ui::SlideAnimation(this));
   resize_area_ = new views::ResizeArea(this);
   AddChildView(resize_area_);
@@ -479,6 +483,13 @@
   return gfx::Point(0, ToolbarView::kVertSpacing);
 }
 
+extensions::ActiveTabPermissionManager*
+    BrowserActionsContainer::GetActiveTabPermissionGranter() {
+  TabContents* tab = chrome::GetActiveTabContents(browser_);
+  return tab ? tab->extension_tab_helper()->active_tab_permission_manager()
+             : NULL;
+}
+
 void BrowserActionsContainer::MoveBrowserAction(const std::string& extension_id,
                                                 size_t new_index) {
   ExtensionService* service = profile_->GetExtensionService();