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

Side by Side Diff: app/resource_bundle.cc

Issue 173260: Some code style cleanup under src/app. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: comment line fix Created 11 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « app/resource_bundle.h ('k') | app/win_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/font.h" 7 #include "app/gfx/font.h"
8 #include "base/gfx/png_decoder.h" 8 #include "base/gfx/png_decoder.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/string_piece.h" 10 #include "base/string_piece.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 *medium_bold_font_ = 180 *medium_bold_font_ =
181 base_font_->DeriveFont(3, base_font_->style() | gfx::Font::BOLD); 181 base_font_->DeriveFont(3, base_font_->style() | gfx::Font::BOLD);
182 182
183 large_font_.reset(new gfx::Font()); 183 large_font_.reset(new gfx::Font());
184 *large_font_ = base_font_->DeriveFont(8); 184 *large_font_ = base_font_->DeriveFont(8);
185 } 185 }
186 } 186 }
187 187
188 gfx::Font ResourceBundle::GetFont(FontStyle style) { 188 gfx::Font ResourceBundle::GetFont(FontStyle style) {
189 LoadFontsIfNecessary(); 189 LoadFontsIfNecessary();
190 switch(style) { 190 switch (style) {
191 case SmallFont: 191 case SmallFont:
192 return *small_font_; 192 return *small_font_;
193 case MediumFont: 193 case MediumFont:
194 return *medium_font_; 194 return *medium_font_;
195 case MediumBoldFont: 195 case MediumBoldFont:
196 return *medium_bold_font_; 196 return *medium_bold_font_;
197 case LargeFont: 197 case LargeFont:
198 return *large_font_; 198 return *large_font_;
199 default: 199 default:
200 return *base_font_; 200 return *base_font_;
201 } 201 }
202 } 202 }
OLDNEW
« no previous file with comments | « app/resource_bundle.h ('k') | app/win_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698