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

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

Issue 911203002: [Extensions Toolbar Mac] Remove ToolbarActionViewDelegateCocoa (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months 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 d0b8ec556c1762a42ac606fdfa856900817ee6d5..9880790399858f0f646fef6c5f74786a36c85916 100644
--- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#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 "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
class Browser;
class ExtensionAction;
@@ -28,7 +28,7 @@ class Extension;
// Action and notify the extension when the icon is clicked.
class PageActionDecoration : public ImageDecoration,
- public ToolbarActionViewDelegateCocoa {
+ public ToolbarActionViewDelegate {
public:
PageActionDecoration(LocationBarViewMac* owner,
Browser* browser,
@@ -66,11 +66,10 @@ class PageActionDecoration : public ImageDecoration,
// Sets the tooltip for this Page Action image.
void SetToolTip(const base::string16& tooltip);
- // Overridden from ToolbarActionViewDelegateCocoa:
+ // Overridden from ToolbarActionViewDelegate:
ToolbarActionViewController* GetPreferredPopupViewController() override;
content::WebContents* GetCurrentWebContents() const override;
void UpdateState() override;
- NSPoint GetPopupPoint() override;
// The location bar view that owns us.
LocationBarViewMac* owner_;

Powered by Google App Engine
This is Rietveld 408576698