| 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 #include "ui/base/resource/resource_bundle.h" | 5 #include "ui/base/resource/resource_bundle.h" |
| 6 | 6 |
| 7 #include <atlbase.h> | 7 #include <atlbase.h> |
| 8 | 8 |
| 9 #include "base/debug/stack_trace.h" | 9 #include "base/debug/stack_trace.h" |
| 10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
| 13 #include "base/resource_util.h" | 13 #include "base/resource_util.h" |
| 14 #include "base/stl_util-inl.h" | 14 #include "base/stl_util.h" |
| 15 #include "base/string_piece.h" | 15 #include "base/string_piece.h" |
| 16 #include "base/synchronization/lock.h" | 16 #include "base/synchronization/lock.h" |
| 17 #include "base/win/windows_version.h" | 17 #include "base/win/windows_version.h" |
| 18 #include "ui/base/l10n/l10n_util.h" | 18 #include "ui/base/l10n/l10n_util.h" |
| 19 #include "ui/base/resource/data_pack.h" | 19 #include "ui/base/resource/data_pack.h" |
| 20 #include "ui/base/ui_base_paths.h" | 20 #include "ui/base/ui_base_paths.h" |
| 21 #include "ui/gfx/font.h" | 21 #include "ui/gfx/font.h" |
| 22 | 22 |
| 23 namespace ui { | 23 namespace ui { |
| 24 | 24 |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 return string16(image->achString, image->nLength); | 182 return string16(image->achString, image->nLength); |
| 183 } | 183 } |
| 184 | 184 |
| 185 // Windows only uses SkBitmap for gfx::Image, so this is the same as | 185 // Windows only uses SkBitmap for gfx::Image, so this is the same as |
| 186 // GetImageNamed. | 186 // GetImageNamed. |
| 187 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) { | 187 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) { |
| 188 return GetImageNamed(resource_id); | 188 return GetImageNamed(resource_id); |
| 189 } | 189 } |
| 190 | 190 |
| 191 } // namespace ui; | 191 } // namespace ui; |
| OLD | NEW |