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

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

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 #ifndef CHROME_COMMON_RESOURCE_BUNDLE_H__ 5 #ifndef CHROME_COMMON_RESOURCE_BUNDLE_H__
6 #define CHROME_COMMON_RESOURCE_BUNDLE_H__ 6 #define CHROME_COMMON_RESOURCE_BUNDLE_H__
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
11 #include <windows.h> 11 #include <windows.h>
12 #endif 12 #endif
13 13
14 #include <map> 14 #include <map>
15 #include <string> 15 #include <string>
16 16
17 #include "base/basictypes.h" 17 #include "base/basictypes.h"
18 #include "base/file_path.h" 18 #include "base/file_path.h"
19 #include "base/lock.h" 19 #include "base/lock.h"
20 #include "base/scoped_ptr.h" 20 #include "base/scoped_ptr.h"
21 21
22 #if defined(OS_LINUX)
Dean McNamee 2009/01/14 11:28:03 I don't see why this should have to be ifdef'd, it
23 namespace base {
24 class DataPack;
25 };
26 #endif
22 class ChromeFont; 27 class ChromeFont;
23 class SkBitmap; 28 class SkBitmap;
24 class StringPiece; 29 class StringPiece;
25 30
26 // ResourceBundle is a central facility to load images and other resources, 31 // ResourceBundle is a central facility to load images and other resources,
27 // such as theme graphics. 32 // such as theme graphics.
28 // Every resource is loaded only once. 33 // Every resource is loaded only once.
29 class ResourceBundle { 34 class ResourceBundle {
30 public: 35 public:
31 // An enumeration of the various font styles used throughout Chrome. 36 // An enumeration of the various font styles used throughout Chrome.
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 scoped_ptr<ChromeFont> large_font_; 171 scoped_ptr<ChromeFont> large_font_;
167 scoped_ptr<ChromeFont> web_font_; 172 scoped_ptr<ChromeFont> web_font_;
168 173
169 static ResourceBundle* g_shared_instance_; 174 static ResourceBundle* g_shared_instance_;
170 175
171 DISALLOW_EVIL_CONSTRUCTORS(ResourceBundle); 176 DISALLOW_EVIL_CONSTRUCTORS(ResourceBundle);
172 }; 177 };
173 178
174 #endif // CHROME_COMMON_RESOURCE_BUNDLE_H__ 179 #endif // CHROME_COMMON_RESOURCE_BUNDLE_H__
175 180
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698