| Index: chrome/browser/tab_contents/tab_contents.cc
|
| ===================================================================
|
| --- chrome/browser/tab_contents/tab_contents.cc (revision 27027)
|
| +++ chrome/browser/tab_contents/tab_contents.cc (working copy)
|
| @@ -574,7 +574,7 @@
|
| NotifyNavigationStateChanged(INVALIDATE_TAB);
|
| }
|
|
|
| -void TabContents::SetPageActionEnabled(const PageAction* page_action,
|
| +void TabContents::SetPageActionEnabled(const ContextualAction* page_action,
|
| bool enable,
|
| const std::string& title,
|
| int icon_id) {
|
| @@ -587,14 +587,14 @@
|
|
|
| if (enable) {
|
| enabled_page_actions_[page_action].reset(
|
| - new PageActionState(title, icon_id));
|
| + new ContextualActionState(title, icon_id));
|
| } else {
|
| enabled_page_actions_.erase(page_action);
|
| }
|
| }
|
|
|
| -const PageActionState* TabContents::GetPageActionState(
|
| - const PageAction* page_action) {
|
| +const ContextualActionState* TabContents::GetPageActionState(
|
| + const ContextualAction* page_action) {
|
| if (enabled_page_actions_.end() == enabled_page_actions_.find(page_action))
|
| return NULL;
|
|
|
|
|