#ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PAGE_ACTION_DECORATION_H_
#define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PAGE_ACTION_DECORATION_H_
-#include "chrome/browser/extensions/extension_action.h"
-#include "chrome/browser/extensions/extension_action_icon_factory.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/strings/string16.h"
#import "chrome/browser/ui/cocoa/location_bar/image_decoration.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-#include "url/gurl.h"
+#import "chrome/browser/ui/cocoa/toolbar/toolbar_action_view_delegate_cocoa.h"
+class ExtensionAction;
@class ExtensionActionContextMenuController;
+class ExtensionActionViewController;
class Browser;
class LocationBarViewMac;
// Action and notify the extension when the icon is clicked.
class PageActionDecoration : public ImageDecoration,
- public ExtensionActionIconFactory::Observer,
- public content::NotificationObserver {
+ public ToolbarActionViewDelegateCocoa {
public:
PageActionDecoration(LocationBarViewMac* owner,
Browser* browser,
ExtensionAction* page_action);
- virtual ~PageActionDecoration();
+ ~PageActionDecoration() override;
- ExtensionAction* page_action() { return page_action_; }
- int current_tab_id() { return current_tab_id_; }
void set_preview_enabled(bool enabled) { preview_enabled_ = enabled; }
bool preview_enabled() const { return preview_enabled_; }
- // Overridden from |ExtensionActionIconFactory::Observer|.
- virtual void OnIconUpdated() OVERRIDE;
+ // Returns the extension associated with this decoration.
+ const extensions::Extension* GetExtension();
+
+ // Returns the page action associated with this decoration.
+ ExtensionAction* GetPageAction();
// Called to notify the Page Action that it should determine whether
// to be visible or hidden. |contents| is the WebContents that is
// active, |url| is the current page URL.
- void UpdateVisibility(content::WebContents* contents, const GURL& url);
-
- // Sets the tooltip for this Page Action image.
- void SetToolTip(NSString* tooltip);
- void SetToolTip(std::string tooltip);
+ void UpdateVisibility(content::WebContents* contents);
// Overridden from |LocationBarDecoration|
- virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
- virtual bool AcceptsMousePress() OVERRIDE;
- virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
- virtual NSString* GetToolTip() OVERRIDE;
- virtual NSMenu* GetMenu() OVERRIDE;
- virtual NSPoint GetBubblePointInFrame(NSRect frame) OVERRIDE;
+ CGFloat GetWidthForSpace(CGFloat width) override;
+ bool AcceptsMousePress() override;
+ bool OnMousePressed(NSRect frame, NSPoint location) override;
+ NSString* GetToolTip() override;
+ NSMenu* GetMenu() override;
+ NSPoint GetBubblePointInFrame(NSRect frame) override;
// Activates the page action in its default frame, and, if |grant_active_tab|
// is true, grants active tab permission to the extension. Returns true if
bool ActivatePageAction(bool grant_active_tab);
private:
- // Activate the page action in the given |frame|.
- bool ActivatePageAction(NSRect frame, bool grant_active_tab);
-
- // Show the popup in the frame, with the given URL.
- void ShowPopup(const NSRect& frame, const GURL& popup_url);
-
- // Returns the extension associated with the page action.
- const extensions::Extension* GetExtension();
+ // Sets the tooltip for this Page Action image.
+ void SetToolTip(const base::string16& tooltip);
- // Overridden from NotificationObserver:
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
+ // Overridden from ToolbarActionViewDelegateCocoa:
+ ToolbarActionViewController* GetPreferredPopupViewController() override;
+ content::WebContents* GetCurrentWebContents() const override;
+ void UpdateState() override;
+ NSPoint GetPopupPoint() override;
+ void SetContextMenuController(
+ ExtensionActionContextMenuController* menuController) override;
// The location bar view that owns us.
LocationBarViewMac* owner_;
- // The current browser (not owned by us).
- Browser* browser_;
-
- // The Page Action that this view represents. The Page Action is not
- // owned by us, it resides in the extension of this particular
- // profile.
- ExtensionAction* page_action_;
-
- // The object that will be used to get the page action icon for us.
- // It may load the icon asynchronously (in which case the initial icon
- // returned by the factory will be transparent), so we have to observe it for
- // updates to the icon.
- scoped_ptr<ExtensionActionIconFactory> icon_factory_;
-
- // 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 view controller for this page action.
+ scoped_ptr<ExtensionActionViewController> viewController_;
// The string to show for a tooltip.
base::scoped_nsobject<NSString> tooltip_;
- // The context menu controller for the Page Action.
- base::scoped_nsobject<
- ExtensionActionContextMenuController> contextMenuController_;
+ // The context menu controller for the Page Action. Weak.
+ ExtensionActionContextMenuController* contextMenuController_;
// 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_;
- // Used to register for notifications received by
- // NotificationObserver.
- content::NotificationRegistrar registrar_;
-
DISALLOW_COPY_AND_ASSIGN(PageActionDecoration);
};
projects / platform / framework / web / crosswalk.git / blobdiff