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

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

Issue 25305002: Implement initial chrome.browserAction.openPopup API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments Created 7 years, 2 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/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 34f300ac07e04720260efa3d538186ec84698fb7..34e75297fc9e843c3d30628d89033b6fcfdb48cd 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -254,12 +254,17 @@ class BrowserActionButton : public content::NotificationObserver,
private:
// Activate the browser action.
void Activate(GtkWidget* widget) {
+ Activate(widget, true);
+ }
+
+ void Activate(GtkWidget* widget, bool allow_grant) {
ExtensionToolbarModel* model = toolbar_->model();
const Extension* extension = extension_;
Browser* browser = toolbar_->browser();
GURL popup_url;
- switch (model->ExecuteBrowserAction(extension, browser, &popup_url)) {
+ switch (model->ExecuteBrowserAction(
+ extension, browser, &popup_url, allow_grant)) {
case ExtensionToolbarModel::ACTION_NONE:
break;
case ExtensionToolbarModel::ACTION_SHOW_POPUP:
@@ -669,14 +674,17 @@ void BrowserActionsToolbarGtk::CreateButtonForExtension(
UpdateVisibility();
}
-GtkWidget* BrowserActionsToolbarGtk::GetBrowserActionWidget(
+BrowserActionButton* BrowserActionsToolbarGtk::GetBrowserActionButton(
const Extension* extension) {
ExtensionButtonMap::iterator it = extension_button_map_.find(
extension->id());
- if (it == extension_button_map_.end())
- return NULL;
+ return it == extension_button_map_.end() ? NULL : it->second.get();
+}
- return it->second.get()->widget();
+GtkWidget* BrowserActionsToolbarGtk::GetBrowserActionWidget(
+ const Extension* extension) {
+ BrowserActionButton* button = GetBrowserActionButton(extension);
+ return button == NULL ? NULL : button->widget();
}
void BrowserActionsToolbarGtk::RemoveButtonForExtension(
@@ -768,6 +776,24 @@ void BrowserActionsToolbarGtk::BrowserActionMoved(const Extension* extension,
gtk_box_reorder_child(GTK_BOX(button_hbox_.get()), button_widget, index);
}
+void BrowserActionsToolbarGtk::BrowserActionShowPopup(
+ const Extension* extension) {
+ // Do not override other popups and only show in active window.
+ if (ExtensionPopupGtk::get_current_extension_popup() ||
+ !browser_->window()->IsActive()) {
+ return;
+ }
+
+ BrowserActionButton* button = GetBrowserActionButton(extension);
+ if (button == NULL || button->widget() == NULL)
+ return;
+
+ GtkWidget* anchor = button->widget();
+ if (!gtk_widget_get_visible(anchor))
+ anchor = button->toolbar_->chevron();
+ button->Activate(anchor, false);
+}
+
void BrowserActionsToolbarGtk::ModelLoaded() {
SetContainerWidth();
}
@@ -1077,13 +1103,13 @@ gboolean BrowserActionsToolbarGtk::OnOverflowMenuButtonPress(
item_index = model_->IncognitoIndexToOriginal(item_index);
const Extension* extension = model_->toolbar_items()[item_index].get();
- ExtensionButtonMap::iterator it = extension_button_map_.find(extension->id());
- if (it == extension_button_map_.end()) {
+ BrowserActionButton* button = GetBrowserActionButton(extension);
+ if (button == NULL) {
NOTREACHED();
return FALSE;
}
- MenuGtk* menu = it->second.get()->GetContextMenu();
+ MenuGtk* menu = button->GetContextMenu();
if (!menu)
return FALSE;

Powered by Google App Engine
This is Rietveld 408576698