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

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: Mainly updates to newer coding style. 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..8bd21bf9693cbe1eda4e3f6d73b975a382898eaf 100644
--- a/views/controls/menu/menu_delegate.cc
+++ b/views/controls/menu/menu_delegate.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "views/controls/menu/menu_config.h"
#include "views/controls/menu/menu_delegate.h"
namespace views {
@@ -14,6 +15,10 @@ std::wstring MenuDelegate::GetLabel(int id) const {
return std::wstring();
}
+const gfx::Font& MenuDelegate::GetLabelFont(int id) const {
+ return MenuConfig::instance().font;
+}
+
std::wstring MenuDelegate::GetTooltipText(int id,
const gfx::Point& screen_loc) {
return std::wstring();

Powered by Google App Engine
This is Rietveld 408576698