Make extension commands grant the activeTab permission.

chrome/browser/ui/gtk/browser_window_gtk.cc

 // Copyright (c) 2012 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/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 11 matching lines @@
 #include "base/nix/xdg_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_item_model.h"
+#include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ skipping 1260 matching lines @@
 bool BrowserWindowGtk::DrawInfoBarArrows(int* x) const {
   if (x) {
     // This is a views specific call that made its way into the interface. We
     // go through GetXPositionOfLocationIcon() since we need widget relativity.
     *x = 0;
     NOTREACHED();
   }
   return true;
 }
 
+extensions::ActiveTabPermissionGranter*
+    BrowserWindowGtk::GetActiveTabPermissionGranter() {
+  TabContents* tab = GetDisplayedTab();
+  if (!tab)
+    return NULL;
+  return extensions::TabHelper::FromWebContents(tab->web_contents())->
+      active_tab_permission_granter();
+}
+
 void BrowserWindowGtk::MaybeShowBookmarkBar(bool animate) {
   TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::MaybeShowBookmarkBar");
   if (!IsBookmarkBarSupported())
     return;
 
   TabContents* tab = GetDisplayedTab();
 
   if (tab)
     bookmark_bar_->SetPageNavigator(browser_.get());
 
@@ skipping 203 matching lines @@
                                                    GdkEvent* event) {
   Close();
 
   // Return true to prevent the gtk window from being destroyed.  Close will
   // destroy it for us.
   return TRUE;
 }
 
 void BrowserWindowGtk::OnMainWindowDestroy(GtkWidget* widget) {
   // Make sure we destroy this object while the main window is still valid.
-  extension_keybinding_registry_.reset(NULL);
+  extension_keybinding_registry_.reset();
 
   // BUG 8712. When we gtk_widget_destroy() in Close(), this will emit the
   // signal right away, and we will be here (while Close() is still in the
   // call stack).  In order to not reenter Close(), and to also follow the
   // expectations of BrowserList, we should run the BrowserWindowGtk destructor
   // not now, but after the run loop goes back to process messages.  Otherwise
   // we will remove ourself from BrowserList while it's being iterated.
   // Additionally, now that we know the window is gone, we need to make sure to
   // set window_ to NULL, otherwise we will try to close the window again when
   // we call Close() in the destructor.
@@ skipping 272 matching lines @@
   }
 
   // We have to realize the window before we try to apply a window shape mask.
   gtk_widget_realize(GTK_WIDGET(window_));
   state_ = gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(window_)));
   // Note that calling this the first time is necessary to get the
   // proper control layout.
   UpdateCustomFrame();
 
   // Add the keybinding registry, now that the window has been realized.
-  extension_keybinding_registry_.reset(
-      new ExtensionKeybindingRegistryGtk(browser_->profile(), window_,
-          extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS));
+  extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryGtk(
+      browser_->profile(),
+      window_,
+      extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS,
+      this));
 
   // We have to call this after the first window is created, but after that only
   // when the theme changes. This sets the icon that will be used for windows
   // that have not explicitly been assigned an icon.
   static bool default_icon_set = false;
   if (!default_icon_set) {
     gtk_util::SetDefaultWindowIcon(window_);
     default_icon_set = true;
   }
   // Set this window's (potentially profile-avatar-emblemed) icon, overriding
@@ skipping 596 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }