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

Unified Diff: ui/base/models/simple_menu_model.cc

Issue 6708029: Lands http://codereview.chromium.org/2928005/ for Dill: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated with changes. Created 9 years, 9 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
« no previous file with comments | « ui/base/models/simple_menu_model.h ('k') | views/view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/models/simple_menu_model.cc
diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
index 6152766b3c5b548a8d9c6239bc29778aaca281f3..28c1b01c444d35d172d0d38be39f47c542c7d475 100644
--- a/ui/base/models/simple_menu_model.cc
+++ b/ui/base/models/simple_menu_model.cc
@@ -54,6 +54,7 @@ void SimpleMenuModel::Delegate::MenuClosed() {
SimpleMenuModel::SimpleMenuModel(Delegate* delegate)
: delegate_(delegate),
+ menu_model_delegate_(NULL),
ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
}
@@ -245,7 +246,7 @@ int SimpleMenuModel::GetGroupIdAt(int index) const {
return items_.at(FlipIndex(index)).group_id;
}
-bool SimpleMenuModel::GetIconAt(int index, SkBitmap* icon) const {
+bool SimpleMenuModel::GetIconAt(int index, SkBitmap* icon) {
if (IsItemDynamicAt(index))
return delegate_->GetIconForCommandId(GetCommandIdAt(index), icon);
@@ -299,6 +300,11 @@ void SimpleMenuModel::MenuClosed() {
method_factory_.NewRunnableMethod(&SimpleMenuModel::OnMenuClosed));
}
+void SimpleMenuModel::SetMenuModelDelegate(
+ ui::MenuModelDelegate* menu_model_delegate) {
+ menu_model_delegate_ = menu_model_delegate;
+}
+
void SimpleMenuModel::OnMenuClosed() {
if (delegate_)
delegate_->MenuClosed();
« no previous file with comments | « ui/base/models/simple_menu_model.h ('k') | views/view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698