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

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

Issue 10533086: Action box menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Action box menu 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/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 fb08f82689dc06753dfd3d0fabc2b91138ec1ac1..11d598a54af7f9a517023c503489b49385c08795 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -791,7 +791,7 @@ bool BrowserActionsToolbarGtk::IsCommandIdChecked(int command_id) const {
}
bool BrowserActionsToolbarGtk::IsCommandIdEnabled(int command_id) const {
- const Extension* extension = model_->GetExtensionByIndex(command_id);
+ const Extension* extension = model_->toolbar_items_by_index(command_id);
return extension->browser_action()->GetIsVisible(GetCurrentTabId());
}
@@ -802,7 +802,7 @@ bool BrowserActionsToolbarGtk::GetAcceleratorForCommandId(
}
void BrowserActionsToolbarGtk::ExecuteCommand(int command_id) {
- const Extension* extension = model_->GetExtensionByIndex(command_id);
+ const Extension* extension = model_->toolbar_items_by_index(command_id);
GURL popup_url;
switch (model_->ExecuteBrowserAction(extension, browser(), &popup_url)) {
@@ -1033,7 +1033,7 @@ gboolean BrowserActionsToolbarGtk::OnOverflowButtonPress(
if (profile_->IsOffTheRecord())
model_index = model_->IncognitoIndexToOriginal(i);
- const Extension* extension = model_->GetExtensionByIndex(model_index);
+ const Extension* extension = model_->toolbar_items_by_index(model_index);
BrowserActionButton* button = extension_button_map_[extension->id()].get();
overflow_menu_model_->AddItem(model_index, UTF8ToUTF16(extension->name()));
@@ -1073,7 +1073,7 @@ gboolean BrowserActionsToolbarGtk::OnOverflowMenuButtonPress(
if (profile_->IsOffTheRecord())
item_index = model_->IncognitoIndexToOriginal(item_index);
- const Extension* extension = model_->GetExtensionByIndex(item_index);
+ const Extension* extension = model_->toolbar_items_by_index(item_index);
ExtensionButtonMap::iterator it = extension_button_map_.find(
extension->id());
if (it == extension_button_map_.end()) {

Powered by Google App Engine
This is Rietveld 408576698