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

Unified Diff: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

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
« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h ('k') | chrome/browser/ui/views/browser_action_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index 8218fdaf89f3bb85eeae5d2a0ea4c3a7989c360f..fb08f82689dc06753dfd3d0fabc2b91138ec1ac1 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -237,6 +237,9 @@ class BrowserActionButton : public content::NotificationObserver,
} else if (default_icon_) {
SetImage(default_icon_);
}
+ bool enabled = extension_->browser_action()->GetIsVisible(tab_id);
+ gtk_widget_set_sensitive(button(), enabled);
+
gtk_widget_queue_draw(button());
}
@@ -581,7 +584,7 @@ BrowserActionsToolbarGtk::~BrowserActionsToolbarGtk() {
hbox_.Destroy();
}
-int BrowserActionsToolbarGtk::GetCurrentTabId() {
+int BrowserActionsToolbarGtk::GetCurrentTabId() const {
TabContents* active_tab = chrome::GetActiveTabContents(browser_);
if (!active_tab)
return -1;
@@ -788,7 +791,8 @@ bool BrowserActionsToolbarGtk::IsCommandIdChecked(int command_id) const {
}
bool BrowserActionsToolbarGtk::IsCommandIdEnabled(int command_id) const {
- return true;
+ const Extension* extension = model_->GetExtensionByIndex(command_id);
+ return extension->browser_action()->GetIsVisible(GetCurrentTabId());
}
bool BrowserActionsToolbarGtk::GetAcceleratorForCommandId(
« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h ('k') | chrome/browser/ui/views/browser_action_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698