| 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/resource/resource_handle.h" | 14 #include "ui/base/resource/resource_handle.h" |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 FilePath GetResourcesPakFilePath(const std::string& pak_name) { | 18 FilePath GetResourcesPakFilePath(const std::string& pak_name) { |
| 19 FilePath path; | 19 FilePath path; |
| 20 PathService::Get(base::DIR_ANDROID_APP_DATA, &path); | 20 if (PathService::Get(base::DIR_ANDROID_APP_DATA, &path)) |
| 21 DCHECK(!path.empty()); | 21 return path.AppendASCII("paks").AppendASCII(pak_name.c_str()); |
| 22 return path.AppendASCII("paks").AppendASCII(pak_name.c_str()); | 22 |
| 23 // Return just the name of the pack file. |
| 24 return FilePath(pak_name.c_str()); |
| 23 } | 25 } |
| 24 | 26 |
| 25 } // namespace | 27 } // namespace |
| 26 | 28 |
| 27 namespace ui { | 29 namespace ui { |
| 28 | 30 |
| 29 void ResourceBundle::LoadCommonResources() { | 31 void ResourceBundle::LoadCommonResources() { |
| 30 AddDataPack(GetResourcesPakFilePath("chrome.pak"), | 32 AddDataPack(GetResourcesPakFilePath("chrome.pak"), |
| 31 ResourceHandle::kScaleFactor100x); | 33 ResourceHandle::kScaleFactor100x); |
| 32 AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"), | 34 AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"), |
| 33 ResourceHandle::kScaleFactor100x); | 35 ResourceHandle::kScaleFactor100x); |
| 34 AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"), | 36 AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"), |
| 35 ResourceHandle::kScaleFactor100x); | 37 ResourceHandle::kScaleFactor100x); |
| 36 } | 38 } |
| 37 | 39 |
| 38 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { | 40 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { |
| 39 // Flipped image is not used on Android. | 41 // Flipped image is not used on Android. |
| 40 DCHECK_EQ(rtl, RTL_DISABLED); | 42 DCHECK_EQ(rtl, RTL_DISABLED); |
| 41 return GetImageNamed(resource_id); | 43 return GetImageNamed(resource_id); |
| 42 } | 44 } |
| 43 | 45 |
| 44 } | 46 } |
| OLD | NEW |