| Index: ui/base/ui_base_paths.cc
|
| diff --git a/ui/base/ui_base_paths.cc b/ui/base/ui_base_paths.cc
|
| index fc07a78e12730041f26d11fe4d43265120753ac4..0f1e1c993393816206730d55fa0a6d672ff05939 100644
|
| --- a/ui/base/ui_base_paths.cc
|
| +++ b/ui/base/ui_base_paths.cc
|
| @@ -10,6 +10,10 @@
|
| #include "base/logging.h"
|
| #include "base/path_service.h"
|
|
|
| +#if defined(OS_ANDROID)
|
| +#include "base/android/path_utils.h"
|
| +#endif
|
| +
|
| namespace ui {
|
|
|
| bool PathProvider(int key, FilePath* result) {
|
| @@ -27,6 +31,9 @@ bool PathProvider(int key, FilePath* result) {
|
| // App dir.
|
| cur = cur.DirName();
|
| cur = cur.Append(FILE_PATH_LITERAL("Resources"));
|
| +#elif defined(OS_ANDROID)
|
| + if (!PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &cur))
|
| + return false;
|
| #else
|
| cur = cur.Append(FILE_PATH_LITERAL("locales"));
|
| #endif
|
| @@ -44,6 +51,13 @@ bool PathProvider(int key, FilePath* result) {
|
| if (!file_util::PathExists(cur)) // we don't want to create this
|
| return false;
|
| break;
|
| +#if defined(OS_ANDROID)
|
| + case ui::DIR_RESOURCE_PAKS_ANDROID:
|
| + if (!PathService::Get(base::DIR_ANDROID_APP_DATA, &cur))
|
| + return false;
|
| + cur = cur.Append(FILE_PATH_LITERAL("paks"));
|
| + break;
|
| +#endif
|
| default:
|
| return false;
|
| }
|
|
|