| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "app/resource_bundle.h" | 5 #include "app/resource_bundle.h" |
| 6 | 6 |
| 7 #include "app/gfx/codec/png_codec.h" | 7 #include "app/gfx/codec/png_codec.h" |
| 8 #include "app/gfx/font.h" | 8 #include "app/gfx/font.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/string_piece.h" | 10 #include "base/string_piece.h" |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 | 169 |
| 170 medium_bold_font_.reset(new gfx::Font()); | 170 medium_bold_font_.reset(new gfx::Font()); |
| 171 *medium_bold_font_ = | 171 *medium_bold_font_ = |
| 172 base_font_->DeriveFont(3, base_font_->style() | gfx::Font::BOLD); | 172 base_font_->DeriveFont(3, base_font_->style() | gfx::Font::BOLD); |
| 173 | 173 |
| 174 large_font_.reset(new gfx::Font()); | 174 large_font_.reset(new gfx::Font()); |
| 175 *large_font_ = base_font_->DeriveFont(8); | 175 *large_font_ = base_font_->DeriveFont(8); |
| 176 } | 176 } |
| 177 } | 177 } |
| 178 | 178 |
| 179 gfx::Font ResourceBundle::GetFont(FontStyle style) { | 179 const gfx::Font& ResourceBundle::GetFont(FontStyle style) { |
| 180 LoadFontsIfNecessary(); | 180 LoadFontsIfNecessary(); |
| 181 switch (style) { | 181 switch (style) { |
| 182 case SmallFont: | 182 case SmallFont: |
| 183 return *small_font_; | 183 return *small_font_; |
| 184 case MediumFont: | 184 case MediumFont: |
| 185 return *medium_font_; | 185 return *medium_font_; |
| 186 case MediumBoldFont: | 186 case MediumBoldFont: |
| 187 return *medium_bold_font_; | 187 return *medium_bold_font_; |
| 188 case LargeFont: | 188 case LargeFont: |
| 189 return *large_font_; | 189 return *large_font_; |
| 190 default: | 190 default: |
| 191 return *base_font_; | 191 return *base_font_; |
| 192 } | 192 } |
| 193 } | 193 } |
| OLD | NEW |