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

Unified Diff: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

Issue 10700007: Page actions behave as disableable browser actions when script badges are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: estade + sky Created 8 years, 5 months 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
Index: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
index ad6b010c51bba1769df9ee28297953b0530fad95..2f03322c5d1c8e9288fa6abfe8dd06247d47bd0b 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
@@ -812,10 +812,14 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
[self browserActionClicked:[menuItem representedObject]];
}
+// TODO(yoz): This only gets called when the set of actions in the overflow
+// menu changes (not for things that would update page actions).
+// It should instead be called each time the menu is opened.
- (void)updateOverflowMenu {
overflowMenu_.reset([[NSMenu alloc] initWithTitle:@""]);
// See menu_button.h for documentation on why this is needed.
[overflowMenu_ addItemWithTitle:@"" action:nil keyEquivalent:@""];
+ [overflowMenu_ setAutoenablesItems:NO];
for (BrowserActionButton* button in hiddenButtons_.get()) {
NSString* name = base::SysUTF8ToNSString([button extension]->name());
@@ -826,6 +830,7 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
[item setRepresentedObject:button];
[item setImage:[button compositedImage]];
[item setTarget:self];
+ [item setEnabled:[button isEnabled]];
}
[chevronMenuButton_ setAttachedMenu:overflowMenu_];
}
« no previous file with comments | « chrome/browser/ui/cocoa/extensions/browser_action_button.mm ('k') | chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698