Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

Issue 789763004: Fix disappearing page actions bug. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments from wittman. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698