| OLD | NEW |
| 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 "ui/base/ui_export.h" | 25 #include "ui/base/ui_export.h" |
| 26 #include "ui/gfx/native_widget_types.h" | 26 #include "ui/gfx/native_widget_types.h" |
| 27 | 27 |
| 28 class SkBitmap; | 28 class SkBitmap; |
| 29 typedef uint32 SkColor; | 29 // Don't use uint32 or uint32_t here because Eclipse's indexer gets confused. |
| 30 // This can be removed when the static colors are moved to ThemeProvider. |
| 31 typedef unsigned int SkColor; |
| 30 | 32 |
| 31 namespace base { | 33 namespace base { |
| 32 class Lock; | 34 class Lock; |
| 33 class StringPiece; | 35 class StringPiece; |
| 34 } | 36 } |
| 35 | 37 |
| 36 namespace gfx { | 38 namespace gfx { |
| 37 class Font; | 39 class Font; |
| 38 class Image; | 40 class Image; |
| 39 } | 41 } |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 | 317 |
| 316 DISALLOW_COPY_AND_ASSIGN(ResourceBundle); | 318 DISALLOW_COPY_AND_ASSIGN(ResourceBundle); |
| 317 }; | 319 }; |
| 318 | 320 |
| 319 } // namespace ui | 321 } // namespace ui |
| 320 | 322 |
| 321 // TODO(beng): Someday, maybe, get rid of this. | 323 // TODO(beng): Someday, maybe, get rid of this. |
| 322 using ui::ResourceBundle; | 324 using ui::ResourceBundle; |
| 323 | 325 |
| 324 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ | 326 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ |
| OLD | NEW |