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

Unified Diff: chrome/browser/gtk/menu_gtk.cc

Issue 5697005: Change SimpleMenuModel on OSX to support dynamic icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved background page badge fix to another CL. Created 10 years 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/gtk/menu_gtk.cc
diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc
index e450c86b9845acbf7df753f9654cff467d0512d5..2f6fe1e2573aa678a7f52165f7a472f6fe827d27 100644
--- a/chrome/browser/gtk/menu_gtk.cc
+++ b/chrome/browser/gtk/menu_gtk.cc
@@ -723,7 +723,7 @@ void MenuGtk::SetButtonItemInfo(GtkWidget* button, gpointer userdata) {
int index = GPOINTER_TO_INT(g_object_get_data(
G_OBJECT(button), "button-model-id"));
- if (model->IsLabelDynamicAt(index)) {
+ if (model->IsItemDynamicAt(index)) {
std::string label =
gfx::ConvertAcceleratorsFromWindowsStyle(
UTF16ToUTF8(model->GetLabelAt(index)));
@@ -782,7 +782,7 @@ void MenuGtk::SetMenuItemInfo(GtkWidget* widget, gpointer userdata) {
if (model->IsVisibleAt(id)) {
// Update the menu item label if it is dynamic.
- if (model->IsLabelDynamicAt(id)) {
+ if (model->IsItemDynamicAt(id)) {
Evan Stade 2010/12/14 01:20:13 add TODO re: images (also in the native_menu_* fil
Andrew T Wilson (Slow) 2010/12/14 18:23:27 Done. BTW, where are the native_menu_* implementa
Evan Stade 2010/12/14 21:28:57 I think that's because the common pattern is to ju
std::string label =
gfx::ConvertAcceleratorsFromWindowsStyle(
UTF16ToUTF8(model->GetLabelAt(id)));

Powered by Google App Engine
This is Rietveld 408576698