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

Unified Diff: views/controls/menu/menu_delegate.cc

Issue 6811025: Change status button menu implementation from Menu2 to MenuItemView. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Changed refcount guard to use OS_CHROMEOS. Created 9 years, 8 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: views/controls/menu/menu_delegate.cc
diff --git a/views/controls/menu/menu_delegate.cc b/views/controls/menu/menu_delegate.cc
index e70fb171ad200f3abe00850e44b1a6c1eed859d1..12187c2f2adef095c1c2d3c06da1d8e7fc8517c9 100644
--- a/views/controls/menu/menu_delegate.cc
+++ b/views/controls/menu/menu_delegate.cc
@@ -14,6 +14,10 @@ std::wstring MenuDelegate::GetLabel(int id) const {
return std::wstring();
}
+const gfx::Font* MenuDelegate::GetLabelFont(int id) const {
+ return NULL;
+}
+
std::wstring MenuDelegate::GetTooltipText(int id,
const gfx::Point& screen_loc) {
return std::wstring();

Powered by Google App Engine
This is Rietveld 408576698