Index: chrome/browser/views/location_bar_view.cc |
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc |
index cbe8dd6f96e0ef8613291faf60ffde1f7ff17ef6..3e3c4332c4bcbd69b4bb3b809ed418be23daaf56 100644 |
--- a/chrome/browser/views/location_bar_view.cc |
+++ b/chrome/browser/views/location_bar_view.cc |
@@ -109,7 +109,7 @@ void LocationBarView::PageActionWithBadgeView::PaintChildren( |
gfx::Canvas* canvas) { |
View::PaintChildren(canvas); |
- ExtensionAction2* action = image_view_->page_action(); |
+ ExtensionAction* action = image_view_->page_action(); |
int tab_id = image_view_->current_tab_id(); |
if (tab_id < 0) |
return; |
@@ -684,7 +684,7 @@ void LocationBarView::DeletePageActionViews() { |
} |
void LocationBarView::RefreshPageActionViews() { |
- std::vector<ExtensionAction2*> page_actions; |
+ std::vector<ExtensionAction*> page_actions; |
ExtensionsService* service = profile_->GetExtensionsService(); |
if (!service) |
return; |
@@ -1230,7 +1230,7 @@ void LocationBarView::SecurityImageView::ShowInfoBubble() { |
LocationBarView::PageActionImageView::PageActionImageView( |
LocationBarView* owner, |
Profile* profile, |
- ExtensionAction2* page_action, |
+ ExtensionAction* page_action, |
const BubblePositioner* bubble_positioner) |
: LocationBarImageView(bubble_positioner), |
owner_(owner), |