if [[ $COMPONENT_BUILD == 1 ]]; then
COMPONENT_ARG="-Dcomponent=shared_library"
fi
- ${TOPDIR}/tizen_src/build/gyp_chromiumefl.sh $XWALK_ARG $COMPONENT_ARG $@
+ ${TOPDIR}/tizen_src/build/gyp_chromiumefl.sh \
+ $XWALK_ARG \
+ $COMPONENT_ARG \
+ -Dedje_dir="out.$(getHostArch)/${BUILD_SUBDIRECTORY}/resources" \
+ $@
fi
}
#include <Elementary.h>
#include "base/files/file_path.h"
+#include "base/path_service.h"
#include "base/trace_event/trace_event.h"
#include "content/browser/selection/selection_controller_efl.h"
+#include "content/common/paths_efl.h"
namespace content {
Evas* evas = evas_object_evas_get(parent);
handle_ = edje_object_add(evas);
- const char* theme_path = FILE_PATH_LITERAL("/usr/share/chromium-efl/themes/SelectionHandles.edj");
- const char* group = GetEdjeObjectGroupPath(type);
+ base::FilePath edj_dir;
+ PathService::Get(PathsEfl::EDJE_RESOURCE_DIR, &edj_dir);
+ base::FilePath selection_handles_edj =
+ edj_dir.Append(FILE_PATH_LITERAL("SelectionHandles.edj"));
+ const char* theme_path = selection_handles_edj.AsUTF8Unsafe().c_str();
+ const char* group = GetEdjeObjectGroupPath(type);
if (edje_file_group_exists(theme_path, group)) {
edje_object_file_set(handle_, theme_path, group);
}
const base::FilePath::CharType kDataPath[] = FILE_PATH_LITERAL(DATA_DIR);
const base::FilePath::CharType kExePath[] = FILE_PATH_LITERAL(EXE_DIR);
const base::FilePath::CharType kLocalePath[] = FILE_PATH_LITERAL(LOCALE_DIR);
-const base::FilePath::CharType kEdjeThemesDir[] = FILE_PATH_LITERAL("themes");
const base::FilePath::CharType kApplicationDataDir[] = FILE_PATH_LITERAL("data");
const base::FilePath::CharType kApplicationCacheDir[] = FILE_PATH_LITERAL("cache");
#if defined(TIZEN_V_3_0)
const base::FilePath::CharType kImagesDir[] = FILE_PATH_LITERAL("/opt/usr/media/Images/");
#endif // TIZEN_V_3_0
#else
-const base::FilePath::CharType kEdjeThemesDir[] = FILE_PATH_LITERAL("resources");
const base::FilePath::CharType kLocaleDir[] = FILE_PATH_LITERAL("locale");
const base::FilePath::CharType kDownloadsDir[] = FILE_PATH_LITERAL("/tmp/");
const base::FilePath::CharType kImagesDir[] = FILE_PATH_LITERAL("/tmp/");
#endif
+const base::FilePath::CharType kEdjePath[] = FILE_PATH_LITERAL(EDJE_DIR);
const base::FilePath::CharType kApplicationName[] = FILE_PATH_LITERAL("chromium-efl");
const base::FilePath::CharType kApplicationDataBaseDir[] = FILE_PATH_LITERAL("db");
case DIR_LOCALE:
*result = base::FilePath(kLocalePath);
return true;
- case EDJE_RESOURCE_DIR:
- *result = base::FilePath(kDataPath).Append(kEdjeThemesDir);
- return true;
#else
case DIR_LOCALE:
PathService::Get(base::DIR_MODULE, result);
*result = result->Append(kLocaleDir);
return true;
+#endif
case EDJE_RESOURCE_DIR:
- PathService::Get(base::DIR_MODULE, result);
- *result = result->Append(kEdjeThemesDir);
+ *result = base::FilePath(kEdjePath);
return true;
-#endif
case DIR_DOWNLOADS:
*result = base::FilePath(kDownloadsDir);
return true;