Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chromecast / common / cast_paths.cc

diff --git a/src/chromecast/common/cast_paths.cc b/src/chromecast/common/cast_paths.cc
index c6ce0b6..d5d471c 100644 (file)
--- a/src/chromecast/common/cast_paths.cc
+++ b/src/chromecast/common/cast_paths.cc
@@ -4,8 +4,10 @@
 
 #include "chromecast/common/cast_paths.h"
 
-#include "base/file_util.h"
+#include "base/base_paths.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
+#include "base/logging.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
 
@@ -26,10 +28,18 @@ bool PathProvider(int key, base::FilePath* result) {
 #endif
       return true;
     }
+#if defined(OS_ANDROID)
+    case FILE_CAST_ANDROID_LOG: {
+      base::FilePath base_dir;
+      CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &base_dir));
+      *result = base_dir.AppendASCII("cast_shell.log");
+      return true;
+    }
+#endif  // defined(OS_ANDROID)
     case FILE_CAST_CONFIG: {
       base::FilePath data_dir;
 #if defined(OS_ANDROID)
-      CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &data_dir);
+      CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &data_dir));
       *result = data_dir.Append("cast_shell.conf");
 #else
       CHECK(PathService::Get(DIR_CAST_HOME, &data_dir));
@@ -37,6 +47,17 @@ bool PathProvider(int key, base::FilePath* result) {
 #endif  // defined(OS_ANDROID)
       return true;
     }
+    case FILE_CAST_PAK: {
+      base::FilePath base_dir;
+#if defined(OS_ANDROID)
+      CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &base_dir));
+      *result = base_dir.Append("paks/cast_shell.pak");
+#else
+      CHECK(PathService::Get(base::DIR_MODULE, &base_dir));
+      *result = base_dir.Append("assets/cast_shell.pak");
+#endif  // defined(OS_ANDROID)
+      return true;
+    }
   }
   return false;
 }