Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5437)

Unified Diff: chrome/browser/ui/cocoa/location_bar/page_action_decoration.h

Issue 703443002: Move more extension action cocoa logic into the platform delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dc_toolbar_abstract_extension_action
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
index 732e0475a484c47488b5d1bcbcf321cdf0744ae9..e825356cdc7c04f16997bcc265d025d480ed0eac 100644
--- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
@@ -9,8 +9,6 @@
#include "base/strings/string16.h"
#import "chrome/browser/ui/cocoa/location_bar/image_decoration.h"
#import "chrome/browser/ui/cocoa/toolbar/toolbar_action_view_delegate_cocoa.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
class ExtensionAction;
@class ExtensionActionContextMenuController;
@@ -30,8 +28,7 @@ class Extension;
// Action and notify the extension when the icon is clicked.
class PageActionDecoration : public ImageDecoration,
- public ToolbarActionViewDelegateCocoa,
- public content::NotificationObserver {
+ public ToolbarActionViewDelegateCocoa {
public:
PageActionDecoration(LocationBarViewMac* owner,
Browser* browser,
@@ -74,11 +71,8 @@ class PageActionDecoration : public ImageDecoration,
content::WebContents* GetCurrentWebContents() const override;
void UpdateState() override;
NSPoint GetPopupPoint() override;
-
- // Overridden from NotificationObserver:
- void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) override;
+ void SetContextMenuController(
+ ExtensionActionContextMenuController* menuController) override;
// The location bar view that owns us.
LocationBarViewMac* owner_;
@@ -89,19 +83,14 @@ class PageActionDecoration : public ImageDecoration,
// 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);
};

Powered by Google App Engine
This is Rietveld 408576698