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

Side by Side Diff: chrome/common/resource_bundle.cc

Issue 17392: Make resource_bundle compile on Linux. (Closed)
Patch Set: Created 11 years, 11 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "chrome/common/resource_bundle.h" 5 #include "chrome/common/resource_bundle.h"
6 6
7 #if defined(OS_WIN)
tony 2009/01/13 21:33:27 Tears. Maybe we should try to work around the fal
7 #include <atlbase.h> 8 #include <atlbase.h>
9 #endif
8 10
9 #include "base/gfx/png_decoder.h" 11 #include "base/gfx/png_decoder.h"
10 #include "base/logging.h" 12 #include "base/logging.h"
11 #include "chrome/common/gfx/chrome_font.h" 13 #include "chrome/common/gfx/chrome_font.h"
12 #include "SkBitmap.h" 14 #include "SkBitmap.h"
13 15
14 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; 16 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
15 17
16 /* static */ 18 /* static */
17 void ResourceBundle::InitSharedInstance(const std::wstring& pref_locale) { 19 void ResourceBundle::InitSharedInstance(const std::wstring& pref_locale) {
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 case MediumBoldFont: 159 case MediumBoldFont:
158 return *medium_bold_font_; 160 return *medium_bold_font_;
159 case LargeFont: 161 case LargeFont:
160 return *large_font_; 162 return *large_font_;
161 case WebFont: 163 case WebFont:
162 return *web_font_; 164 return *web_font_;
163 default: 165 default:
164 return *base_font_; 166 return *base_font_;
165 } 167 }
166 } 168 }
OLDNEW
« chrome/common/resource_bundle.h ('K') | « chrome/common/resource_bundle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698