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

Side by Side Diff: app/resource_bundle.cc

Issue 113443: ChromeCanvas->gfx::Canvas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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/l10n_util.cc ('k') | app/resource_bundle_linux.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/chrome_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"
11 #include "net/base/file_stream.h" 11 #include "net/base/file_stream.h"
12 #include "net/base/net_errors.h" 12 #include "net/base/net_errors.h"
13 #include "SkBitmap.h" 13 #include "SkBitmap.h"
14 14
15 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; 15 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
16 16
17 /* static */ 17 /* static */
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « app/l10n_util.cc ('k') | app/resource_bundle_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698