| Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
| diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
| index 73b809db8abb6a64ca558794a47032a5a8529dcd..7961185cbc6d823d833ef6edb4270b6c3fb55e3d 100644
|
| --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
| +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
| @@ -66,7 +66,6 @@ class LocationBarViewMac : public LocationBar,
|
| void UpdateContentSettingsIcons() override;
|
| void UpdateManagePasswordsIconAndBubble() override;
|
| void UpdatePageActions() override;
|
| - void InvalidatePageActions() override;
|
| void UpdateBookmarkStarVisibility() override;
|
| bool ShowPageActionPopup(const extensions::Extension* extension,
|
| bool grant_active_tab) override;
|
| @@ -203,6 +202,11 @@ class LocationBarViewMac : public LocationBar,
|
| // extension service.
|
| void RefreshPageActionDecorations();
|
|
|
| + // Whether the page actions represented by |page_action_decorations_| differ
|
| + // in ordering or value from |page_actions|.
|
| + bool PageActionsDiffer(
|
| + const std::vector<ExtensionAction*>& page_actions) const;
|
| +
|
| // Updates visibility of the content settings icons based on the current
|
| // tab contents state.
|
| bool RefreshContentSettingsDecorations();
|
| @@ -245,9 +249,6 @@ class LocationBarViewMac : public LocationBar,
|
| // levels.
|
| scoped_ptr<ZoomDecoration> zoom_decoration_;
|
|
|
| - // The installed page actions.
|
| - std::vector<ExtensionAction*> page_actions_;
|
| -
|
| // Decorations for the installed Page Actions.
|
| ScopedVector<PageActionDecoration> page_action_decorations_;
|
|
|
|
|