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

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: Update after merge 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 8becfa2f87542e48af33a240c73a8d8446d45739..04450efdcd3dd8be63a96dcdc9490d90ac10087a 100644
--- a/chrome/browser/gtk/menu_gtk.cc
+++ b/chrome/browser/gtk/menu_gtk.cc
@@ -744,7 +744,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)));
@@ -803,7 +803,8 @@ void MenuGtk::SetMenuItemInfo(GtkWidget* widget, gpointer userdata) {
if (model->IsVisibleAt(id)) {
// Update the menu item label if it is dynamic.
- if (model->IsLabelDynamicAt(id)) {
+ // TODO(atwilson): Update the icon as well (http://crbug.com/66508).
+ if (model->IsItemDynamicAt(id)) {
std::string label =
gfx::ConvertAcceleratorsFromWindowsStyle(
UTF16ToUTF8(model->GetLabelAt(id)));
« no previous file with comments | « chrome/browser/download/download_shelf.cc ('k') | chrome/browser/notifications/notification_options_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698