| Index: chrome/browser/views/location_bar_view.cc
|
| ===================================================================
|
| --- chrome/browser/views/location_bar_view.cc (revision 27027)
|
| +++ chrome/browser/views/location_bar_view.cc (working copy)
|
| @@ -655,7 +655,7 @@
|
| }
|
|
|
| void LocationBarView::RefreshPageActionViews() {
|
| - std::vector<PageAction*> page_actions;
|
| + std::vector<ContextualAction*> page_actions;
|
| if (profile_->GetExtensionsService())
|
| page_actions = profile_->GetExtensionsService()->GetPageActions();
|
|
|
| @@ -1192,7 +1192,7 @@
|
| LocationBarView::PageActionImageView::PageActionImageView(
|
| LocationBarView* owner,
|
| Profile* profile,
|
| - const PageAction* page_action,
|
| + const ContextualAction* page_action,
|
| const BubblePositioner* bubble_positioner)
|
| : LocationBarImageView(bubble_positioner),
|
| owner_(owner),
|
| @@ -1259,7 +1259,8 @@
|
| current_tab_id_ = ExtensionTabUtil::GetTabId(contents);
|
| current_url_ = url;
|
|
|
| - const PageActionState* state = contents->GetPageActionState(page_action_);
|
| + const ContextualActionState* state =
|
| + contents->GetPageActionState(page_action_);
|
| bool visible = state != NULL;
|
| if (visible) {
|
| // Set the tooltip.
|
|
|