Commit dadea69a authored by Sergey Ulanov's avatar Sergey Ulanov Committed by Commit Bot

Chromecast: Use DIR_ASSETS instead of DIR_MODULE to locate resources.

DIR_MODULE should not be used to discover resource files on Fuchsia.
Replaced it with DIR_ASSETS. This fixes resource loading on Fuchsia,
but has no effect on other platforms.

Change-Id: Ia0d235a4d07dc2f3e6bcd905a401ede113998e8e
Bug: 805727
Reviewed-on: https://chromium-review.googlesource.com/1100377Reviewed-by: default avatarSergey Volk <servolk@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568147}
parent 67e1bc9a
...@@ -65,7 +65,7 @@ bool PathProvider(int key, base::FilePath* result) { ...@@ -65,7 +65,7 @@ bool PathProvider(int key, base::FilePath* result) {
CHECK(base::PathService::Get(base::DIR_ANDROID_APP_DATA, &base_dir)); CHECK(base::PathService::Get(base::DIR_ANDROID_APP_DATA, &base_dir));
*result = base_dir.Append("paks/cast_shell.pak"); *result = base_dir.Append("paks/cast_shell.pak");
#else #else
CHECK(base::PathService::Get(base::DIR_MODULE, &base_dir)); CHECK(base::PathService::Get(base::DIR_ASSETS, &base_dir));
*result = base_dir.Append("assets/cast_shell.pak"); *result = base_dir.Append("assets/cast_shell.pak");
#endif // defined(OS_ANDROID) #endif // defined(OS_ANDROID)
return true; return true;
......
...@@ -42,7 +42,7 @@ base::FilePath CastResourceDelegate::GetPathForLocalePack( ...@@ -42,7 +42,7 @@ base::FilePath CastResourceDelegate::GetPathForLocalePack(
const base::FilePath& pack_path, const base::FilePath& pack_path,
const std::string& locale) { const std::string& locale) {
base::FilePath product_dir; base::FilePath product_dir;
if (!base::PathService::Get(base::DIR_MODULE, &product_dir)) { if (!base::PathService::Get(base::DIR_ASSETS, &product_dir)) {
NOTREACHED(); NOTREACHED();
} }
return product_dir. return product_dir.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment