summaryrefslogtreecommitdiffstats
path: root/views/controls/menu/menu_delegate.cc
diff options
context:
space:
mode:
authorrhashimoto@chromium.org <rhashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 16:20:51 +0000
committerrhashimoto@chromium.org <rhashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 16:20:51 +0000
commitfeeb016d8e0c066e686c89385c21831d91e0f662 (patch)
tree72cb50e7eb5924f7291c66d74099d38275626ac4 /views/controls/menu/menu_delegate.cc
parentefa5521a57c9765bc968d42ce22bb449ae40f3b3 (diff)
downloadchromium_src-feeb016d8e0c066e686c89385c21831d91e0f662.zip
chromium_src-feeb016d8e0c066e686c89385c21831d91e0f662.tar.gz
chromium_src-feeb016d8e0c066e686c89385c21831d91e0f662.tar.bz2
Add views::MenuDelegate call for per-item fonts.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6969046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/menu_delegate.cc')
-rw-r--r--views/controls/menu/menu_delegate.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/views/controls/menu/menu_delegate.cc b/views/controls/menu/menu_delegate.cc
index e70fb17..8bd21bf 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();