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 "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "ui/base/layout.h" | 9 #include "ui/base/layout.h" |
| 10 #include "ui/base/resource/resource_handle.h" |
10 #include "ui/base/ui_base_paths.h" | 11 #include "ui/base/ui_base_paths.h" |
11 #include "ui/gfx/image/image.h" | 12 #include "ui/gfx/image/image.h" |
12 | 13 |
13 namespace { | 14 namespace { |
14 | 15 |
15 FilePath GetResourcesPakFilePath(const std::string& pak_name) { | 16 FilePath GetResourcesPakFilePath(const std::string& pak_name) { |
16 FilePath path; | 17 FilePath path; |
17 if (PathService::Get(base::DIR_MODULE, &path)) | 18 if (PathService::Get(base::DIR_MODULE, &path)) |
18 return path.AppendASCII(pak_name.c_str()); | 19 return path.AppendASCII(pak_name.c_str()); |
19 return FilePath(); | 20 return FilePath(); |
20 } | 21 } |
21 | 22 |
22 } // namespace | 23 } // namespace |
23 | 24 |
24 namespace ui { | 25 namespace ui { |
25 | 26 |
26 void ResourceBundle::LoadCommonResources() { | 27 void ResourceBundle::LoadCommonResources() { |
27 AddDataPack(GetResourcesPakFilePath("chrome.pak")); | 28 AddDataPack(GetResourcesPakFilePath("chrome.pak"), |
28 AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak")); | 29 ResourceHandle::kScaleFactor100x); |
| 30 AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"), |
| 31 ResourceHandle::kScaleFactor100x); |
29 | 32 |
30 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { | 33 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { |
31 AddDataPack(GetResourcesPakFilePath("ui_resources_touch.pak")); | 34 AddDataPack(GetResourcesPakFilePath("ui_resources_touch.pak"), |
| 35 ResourceHandle::kScaleFactor100x); |
32 } else { | 36 } else { |
33 AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak")); | 37 AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"), |
| 38 ResourceHandle::kScaleFactor100x); |
34 } | 39 } |
35 } | 40 } |
36 | 41 |
37 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { | 42 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { |
38 // Flipped image is not used on ChromeOS. | 43 // Flipped image is not used on ChromeOS. |
39 DCHECK_EQ(rtl, RTL_DISABLED); | 44 DCHECK_EQ(rtl, RTL_DISABLED); |
40 return GetImageNamed(resource_id); | 45 return GetImageNamed(resource_id); |
41 } | 46 } |
42 | 47 |
43 } // namespace ui | 48 } // namespace ui |
OLD | NEW |