| 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 48996b1bc5e1daf03ad28f1b375e8bdb06f4fad9..f94657bc6f63428471b6bfe16d9b0db03d58760a 100644
|
| --- a/chrome/browser/extensions/page_action_controller.cc
|
| +++ b/chrome/browser/extensions/page_action_controller.cc
|
| @@ -35,7 +35,7 @@ std::vector<ExtensionAction*> PageActionController::GetCurrentActions() const {
|
|
|
| for (ExtensionSet::const_iterator i = service->extensions()->begin();
|
| i != service->extensions()->end(); ++i) {
|
| - ExtensionAction* action = (*i)->page_action();
|
| + ExtensionAction* action = service->GetPageAction(**i);
|
| if (action)
|
| current_actions.push_back(action);
|
| }
|
| @@ -50,7 +50,7 @@ LocationBarController::Action PageActionController::OnClicked(
|
|
|
| const Extension* extension = service->extensions()->GetByID(extension_id);
|
| CHECK(extension);
|
| - ExtensionAction* page_action = extension->page_action();
|
| + ExtensionAction* page_action = service->GetPageAction(*extension);
|
| CHECK(page_action);
|
| int tab_id = ExtensionTabUtil::GetTabId(web_contents());
|
|
|
|
|