summaryrefslogtreecommitdiffstats
path: root/app/resource_bundle.cc
diff options
context:
space:
mode:
authorchocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-19 23:48:12 +0000
committerchocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-19 23:48:12 +0000
commit3c30891915a40bac4cee93a6dc9246cf1e8d9c95 (patch)
tree32044d3196735a4abf1b5533776868de072c9899 /app/resource_bundle.cc
parentba388887c335ee6e1c7ef1ff065aa550ad1bd9bf (diff)
downloadchromium_src-3c30891915a40bac4cee93a6dc9246cf1e8d9c95.zip
chromium_src-3c30891915a40bac4cee93a6dc9246cf1e8d9c95.tar.gz
chromium_src-3c30891915a40bac4cee93a6dc9246cf1e8d9c95.tar.bz2
New network menu button UI for ChromeOS.
Added ability to change label font in gtk menu item. TEST=none BUG=none Review URL: http://codereview.chromium.org/650074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle.cc')
-rw-r--r--app/resource_bundle.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc
index 9d9eb21..f0b9923 100644
--- a/app/resource_bundle.cc
+++ b/app/resource_bundle.cc
@@ -146,6 +146,10 @@ void ResourceBundle::LoadFontsIfNecessary() {
if (!base_font_.get()) {
base_font_.reset(new gfx::Font());
+ bold_font_.reset(new gfx::Font());
+ *bold_font_ =
+ base_font_->DeriveFont(0, base_font_->style() | gfx::Font::BOLD);
+
small_font_.reset(new gfx::Font());
*small_font_ = base_font_->DeriveFont(-2);
@@ -164,6 +168,8 @@ void ResourceBundle::LoadFontsIfNecessary() {
const gfx::Font& ResourceBundle::GetFont(FontStyle style) {
LoadFontsIfNecessary();
switch (style) {
+ case BoldFont:
+ return *bold_font_;
case SmallFont:
return *small_font_;
case MediumFont: