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

Unified Diff: app/menus/button_menu_item_model.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
« no previous file with comments | « app/menus/button_menu_item_model.h ('k') | app/menus/menu_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/menus/button_menu_item_model.cc
diff --git a/app/menus/button_menu_item_model.cc b/app/menus/button_menu_item_model.cc
index a7fbcde80563ae18382479b8b87b420503b332fa..3d44b1b069698f17b2eb6006eafd235d89b469c0 100644
--- a/app/menus/button_menu_item_model.cc
+++ b/app/menus/button_menu_item_model.cc
@@ -8,7 +8,7 @@
namespace menus {
-bool ButtonMenuItemModel::Delegate::IsLabelForCommandIdDynamic(
+bool ButtonMenuItemModel::Delegate::IsItemForCommandIdDynamic(
int command_id) const {
return false;
}
@@ -82,14 +82,14 @@ int ButtonMenuItemModel::GetCommandIdAt(int index) const {
return items_[index].command_id;
}
-bool ButtonMenuItemModel::IsLabelDynamicAt(int index) const {
+bool ButtonMenuItemModel::IsItemDynamicAt(int index) const {
if (delegate_)
- return delegate_->IsLabelForCommandIdDynamic(GetCommandIdAt(index));
+ return delegate_->IsItemForCommandIdDynamic(GetCommandIdAt(index));
return false;
}
string16 ButtonMenuItemModel::GetLabelAt(int index) const {
- if (IsLabelDynamicAt(index))
+ if (IsItemDynamicAt(index))
return delegate_->GetLabelForCommandId(GetCommandIdAt(index));
return items_[index].label;
}
« no previous file with comments | « app/menus/button_menu_item_model.h ('k') | app/menus/menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698