Index: chrome/browser/extensions/page_action_controller.cc |
diff --git a/chrome/browser/extensions/page_action_controller.cc b/chrome/browser/extensions/page_action_controller.cc |
index 255e4ba4aef8ffa7530311da27981dcb88c86c4e..308409be6949380e7c64333973351ec3d15a67d8 100644 |
--- a/chrome/browser/extensions/page_action_controller.cc |
+++ b/chrome/browser/extensions/page_action_controller.cc |
@@ -22,7 +22,7 @@ PageActionController::PageActionController(TabContents* tab_contents) |
PageActionController::~PageActionController() {} |
-std::vector<ExtensionAction*> PageActionController::GetCurrentActions() { |
+std::vector<ExtensionAction*> PageActionController::GetCurrentActions() const { |
ExtensionService* service = GetExtensionService(); |
if (!service) |
return std::vector<ExtensionAction*>(); |
@@ -38,6 +38,13 @@ std::vector<ExtensionAction*> PageActionController::GetCurrentActions() { |
return current_actions; |
} |
+base::WeakPtr<LocationBarController::IconAnimation> |
+ PageActionController::GetIconAnimation( |
+ const ExtensionAction* action) const { |
+ // Don't animate page actions. |
+ return base::WeakPtr<IconAnimation>(); |
+} |
+ |
LocationBarController::Action PageActionController::OnClicked( |
const std::string& extension_id, int mouse_button) { |
ExtensionService* service = GetExtensionService(); |
@@ -76,7 +83,7 @@ LocationBarController::Action PageActionController::OnClicked( |
return ACTION_NONE; |
} |
-ExtensionService* PageActionController::GetExtensionService() { |
+ExtensionService* PageActionController::GetExtensionService() const { |
return ExtensionSystem::Get(tab_contents_->profile())->extension_service(); |
} |