| 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> | |
| 8 | |
| 9 #include "base/file_util.h" | |
| 10 #include "base/files/file_path.h" | |
| 11 #include "base/logging.h" | 7 #include "base/logging.h" |
| 12 #include "base/path_service.h" | |
| 13 #include "base/strings/stringprintf.h" | |
| 14 #include "ui/base/resource/resource_handle.h" | |
| 15 #include "ui/base/ui_base_paths.h" | |
| 16 | 8 |
| 17 namespace ui { | 9 namespace ui { |
| 18 | 10 |
| 19 void ResourceBundle::LoadCommonResources() { | |
| 20 base::FilePath path; | |
| 21 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &path); | |
| 22 AddDataPackFromPath(path.AppendASCII("chrome_100_percent.pak"), | |
| 23 SCALE_FACTOR_100P); | |
| 24 } | |
| 25 | |
| 26 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { | 11 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { |
| 27 // Flipped image is not used on Android. | 12 // Flipped image is not used on Android. |
| 28 DCHECK_EQ(rtl, RTL_DISABLED); | 13 DCHECK_EQ(rtl, RTL_DISABLED); |
| 29 return GetImageNamed(resource_id); | 14 return GetImageNamed(resource_id); |
| 30 } | 15 } |
| 31 | 16 |
| 32 } | 17 } // namespace ui |
| OLD | NEW |