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

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

Issue 10703090: Turn pageAction.show -> browserAction.sensibleThing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: views (incomplete) 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_action_button.mm
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
index 30ced534ba35f2575894949fecc8ab892790f078..728d0187e780b9de156fe034dab03f07d5eb13e2 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
@@ -173,7 +173,8 @@ class ExtensionImageTrackerBridge : public content::NotificationObserver,
}
- (void)mouseDown:(NSEvent*)theEvent {
- [[self cell] setHighlighted:YES];
+ if ([self isEnabled])
+ [[self cell] setHighlighted:YES];
dragCouldStart_ = YES;
}
@@ -256,14 +257,19 @@ class ExtensionImageTrackerBridge : public content::NotificationObserver,
if (tabId_ < 0)
return;
- std::string tooltip = extension_->browser_action()->GetTitle(tabId_);
+ ExtensionAction* browser_action = extension_->browser_action();
+ CHECK(browser_action);
+
+ [self setEnabled:browser_action->GetIsVisible(tabId_)];
+
+ std::string tooltip = browser_action->GetTitle(tabId_);
if (tooltip.empty()) {
[self setToolTip:nil];
} else {
[self setToolTip:base::SysUTF8ToNSString(tooltip)];
}
- SkBitmap image = extension_->browser_action()->GetIcon(tabId_);
+ SkBitmap image = browser_action->GetIcon(tabId_);
if (!image.isNull()) {
[self setTabSpecificIcon:gfx::SkBitmapToNSImage(image)];
[self setImage:tabSpecificIcon_];
« no previous file with comments | « chrome/browser/extensions/extension_toolbar_model.cc ('k') | chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698