Revert 127146 - Add Extension Keybinding test for page actions and port the PageAction keybindings …

chrome/browser/ui/gtk/location_bar_view_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
@@ skipping 30 matching lines @@
 class ContentSettingBubbleGtk;
 class ExtensionAction;
 class ThemeServiceGtk;
 class SkBitmap;
 class ToolbarModel;
 
 namespace content {
 class WebContents;
 }
 
-namespace ui {
-class AcceleratorGtk;
-}
-
 class LocationBarViewGtk : public AutocompleteEditController,
                            public LocationBar,
                            public LocationBarTesting,
                            public content::NotificationObserver {
  public:
   explicit LocationBarViewGtk(Browser* browser);
   virtual ~LocationBarViewGtk();
 
   void Init(bool popup_window_mode);
 
@@ skipping 139 matching lines @@
 
     // The label's default requisition (cached so we can animate accordingly).
     GtkRequisition label_req_;
 
     base::WeakPtrFactory<ContentSettingImageViewGtk> weak_factory_;
 
     DISALLOW_COPY_AND_ASSIGN(ContentSettingImageViewGtk);
   };
 
   class PageActionViewGtk : public ImageLoadingTracker::Observer,
-                            public content::NotificationObserver,
                             public ExtensionContextMenuModel::PopupDelegate {
    public:
     PageActionViewGtk(LocationBarViewGtk* owner, ExtensionAction* page_action);
     virtual ~PageActionViewGtk();
 
     GtkWidget* widget() { return event_box_.get(); }
 
     ExtensionAction* page_action() { return page_action_; }
 
     void set_preview_enabled(bool preview_enabled) {
       preview_enabled_ = preview_enabled;
     }
 
     bool IsVisible();
 
     // Called to notify the PageAction that it should determine whether to be
     // visible or hidden. |contents| is the TabContents that is active, |url|
     // is the current page URL.
     void UpdateVisibility(content::WebContents* contents, const GURL& url);
 
     // A callback from ImageLoadingTracker for when the image has loaded.
     virtual void OnImageLoaded(const gfx::Image& image,
                                const std::string& extension_id,
                                int index) OVERRIDE;
 
     // Simulate left mouse click on the page action button.
     void TestActivatePageAction();
 
-    // Implement the content::NotificationObserver interface.
-    virtual void Observe(int type,
-                         const content::NotificationSource& source,
-                         const content::NotificationDetails& details) OVERRIDE;
-
     // Overridden from ExtensionContextMenuModel::PopupDelegate:
     virtual void InspectPopup(ExtensionAction* action) OVERRIDE;
 
    private:
     // Show the popup for this page action. If |devtools| is true, show it
     // with a debugger window attached. Returns true if a popup was shown.
     bool ShowPopup(bool devtools);
 
-    // Connect the accelerator for the page action popup.
-    void ConnectPageActionAccelerator();
-
-    // Disconnect the accelerator for the page action popup.
-    void DisconnectPageActionAccelerator();
-
     CHROMEGTK_CALLBACK_1(PageActionViewGtk, gboolean, OnButtonPressed,
                          GdkEventButton*);
     CHROMEGTK_CALLBACK_1(PageActionViewGtk, gboolean, OnExposeEvent,
                          GdkEventExpose*);
-    CHROMEGTK_CALLBACK_0(PageActionViewGtk, void, OnRealize);
-
-    // The accelerator handler for when the shortcuts to open the popup is
-    // struck.
-    static gboolean OnGtkAccelerator(GtkAccelGroup* accel_group,
-                                     GObject* acceleratable,
-                                     guint keyval,
-                                     GdkModifierType modifier,
-                                     void* user_data);
 
     // The location bar view that owns us.
     LocationBarViewGtk* owner_;
 
     // The PageAction that this view represents. The PageAction is not owned by
     // us, it resides in the extension of this particular profile.
     ExtensionAction* page_action_;
 
     // A cache of all the different icon paths associated with this page action.
     typedef std::map<std::string, GdkPixbuf*> PixbufMap;
@@ skipping 12 matching lines @@
     // The widgets for this page action.
     ui::OwnedWidgetGtk event_box_;
     ui::OwnedWidgetGtk image_;
 
     // The tab id we are currently showing the icon for.
     int current_tab_id_;
 
     // The URL we are currently showing the icon for.
     GURL current_url_;
 
-    // The native browser window of the location bar that owns us.
-    gfx::NativeWindow window_;
-
-    // The Notification registrar.
-    content::NotificationRegistrar registrar_;
-
-    // The accelerator group used to handle accelerators, owned by this object.
-    GtkAccelGroup* accel_group_;
-
-    // The keybinding accelerator registered to show the page action popup.
-    scoped_ptr<ui::AcceleratorGtk> keybinding_;
-
     // This is used for post-install visual feedback. The page_action icon
     // is briefly shown even if it hasn't been enabled by its extension.
     bool preview_enabled_;
 
     // The context menu view and model for this extension action.
     scoped_ptr<MenuGtk> context_menu_;
     scoped_refptr<ExtensionContextMenuModel> context_menu_model_;
 
     DISALLOW_COPY_AND_ASSIGN(PageActionViewGtk);
   };
@@ skipping 151 matching lines @@
   // The last search keyword that was shown via the |tab_to_search_box_|.
   string16 last_keyword_;
 
   // Used to change the visibility of the star decoration.
   BooleanPrefMember edit_bookmarks_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_