Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / location_bar / page_action_decoration.h

diff --git a/src/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h b/src/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
index 7c70030..9e99c87 100644 (file)
--- a/src/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
+++ b/src/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
@@ -25,8 +25,7 @@ class WebContents;
 
 class PageActionDecoration : public ImageDecoration,
                              public ExtensionActionIconFactory::Observer,
-                             public content::NotificationObserver,
-                             public ExtensionAction::IconAnimation::Observer {
+                             public content::NotificationObserver {
  public:
   PageActionDecoration(LocationBarViewMac* owner,
                        Browser* browser,
@@ -56,9 +55,6 @@ class PageActionDecoration : public ImageDecoration,
 
   // Overridden from |LocationBarDecoration|
   virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
-  virtual void DrawWithBackgroundInFrame(NSRect background_frame,
-                                         NSRect frame,
-                                         NSView* control_view) OVERRIDE;
   virtual bool AcceptsMousePress() OVERRIDE;
   virtual bool OnMousePressed(NSRect frame) OVERRIDE;
   virtual NSString* GetToolTip() OVERRIDE;
@@ -71,9 +67,6 @@ class PageActionDecoration : public ImageDecoration,
   // Show the popup in the frame, with the given URL.
   void ShowPopup(const NSRect& frame, const GURL& popup_url);
 
-  // Overridden from ExtensionAction::IconAnimation::Observer.
-  virtual void OnIconChanged() OVERRIDE;
-
   // Overridden from NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
@@ -115,10 +108,6 @@ class PageActionDecoration : public ImageDecoration,
   // extension.
   bool preview_enabled_;
 
-  // Fade-in animation for the icon with observer scoped to this.
-  ExtensionAction::IconAnimation::ScopedObserver
-      scoped_icon_animation_observer_;
-
   // Used to register for notifications received by
   // NotificationObserver.
   content::NotificationRegistrar registrar_;