OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <string> | 7 #include <string> |
8 | 8 |
9 #include "base/file_path.h" | 9 #include "base/file_path.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/stringprintf.h" | 13 #include "base/stringprintf.h" |
14 #include "ui/base/ui_base_paths.h" | 14 #include "ui/base/ui_base_paths.h" |
15 #include "ui/base/resource/resource_handle.h" | 15 #include "ui/base/resource/resource_handle.h" |
16 | 16 |
17 namespace ui { | 17 namespace ui { |
18 | 18 |
19 void ResourceBundle::LoadCommonResources() { | 19 void ResourceBundle::LoadCommonResources() { |
20 FilePath path; | 20 FilePath path; |
21 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &path); | 21 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &path); |
22 AddDataPackFromPath(path.AppendASCII("chrome.pak"), | 22 AddDataPackFromPath(path.AppendASCII("chrome.pak"), |
23 SCALE_FACTOR_100P); | 23 SCALE_FACTOR_100P); |
24 AddDataPackFromPath(path.AppendASCII("chrome_100_percent.pak"), | 24 AddDataPackFromPath(path.AppendASCII("theme_resources_100_percent.pak"), |
| 25 SCALE_FACTOR_100P); |
| 26 AddDataPackFromPath(path.AppendASCII("ui_resources_100_percent.pak"), |
25 SCALE_FACTOR_100P); | 27 SCALE_FACTOR_100P); |
26 } | 28 } |
27 | 29 |
28 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { | 30 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { |
29 // Flipped image is not used on Android. | 31 // Flipped image is not used on Android. |
30 DCHECK_EQ(rtl, RTL_DISABLED); | 32 DCHECK_EQ(rtl, RTL_DISABLED); |
31 return GetImageNamed(resource_id); | 33 return GetImageNamed(resource_id); |
32 } | 34 } |
33 | 35 |
34 } | 36 } |
OLD | NEW |