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

Side by Side Diff: ui/base/resource/resource_bundle.h

Issue 8815013: Don't attempt to forward declare StringPiece. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | « ui/base/resource/data_pack.h ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ 5 #ifndef UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
6 #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ 6 #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
11 #if defined(OS_WIN) 11 #if defined(OS_WIN)
12 #include <windows.h> 12 #include <windows.h>
13 #endif 13 #endif
14 14
15 #include <map> 15 #include <map>
16 #include <string> 16 #include <string>
17 #include <vector> 17 #include <vector>
18 18
19 #include "base/basictypes.h" 19 #include "base/basictypes.h"
20 #include "base/file_path.h" 20 #include "base/file_path.h"
21 #include "base/gtest_prod_util.h" 21 #include "base/gtest_prod_util.h"
22 #include "base/memory/ref_counted_memory.h" 22 #include "base/memory/ref_counted_memory.h"
23 #include "base/memory/scoped_ptr.h" 23 #include "base/memory/scoped_ptr.h"
24 #include "base/string16.h" 24 #include "base/string16.h"
25 #include "base/string_piece.h"
25 #include "ui/base/ui_export.h" 26 #include "ui/base/ui_export.h"
26 #include "ui/gfx/native_widget_types.h" 27 #include "ui/gfx/native_widget_types.h"
27 28
28 class SkBitmap; 29 class SkBitmap;
29 typedef uint32 SkColor; 30 typedef uint32 SkColor;
30 31
31 namespace base { 32 namespace base {
32 class Lock; 33 class Lock;
33 class StringPiece;
34 } 34 }
35 35
36 namespace gfx { 36 namespace gfx {
37 class Font; 37 class Font;
38 class Image; 38 class Image;
39 } 39 }
40 40
41 #if defined(OS_MACOSX) 41 #if defined(OS_MACOSX)
42 #ifdef __OBJC__ 42 #ifdef __OBJC__
43 @class NSImage; 43 @class NSImage;
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 315
316 DISALLOW_COPY_AND_ASSIGN(ResourceBundle); 316 DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
317 }; 317 };
318 318
319 } // namespace ui 319 } // namespace ui
320 320
321 // TODO(beng): Someday, maybe, get rid of this. 321 // TODO(beng): Someday, maybe, get rid of this.
322 using ui::ResourceBundle; 322 using ui::ResourceBundle;
323 323
324 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ 324 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
OLDNEW
« no previous file with comments | « ui/base/resource/data_pack.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698