Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(993)

Unified Diff: ui/base/ui_base_paths.cc

Issue 288323003: ui: Fix the path of DIR_TEST_DATA key. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no assert_true Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/ui_base_paths.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ui_base_paths.cc
diff --git a/ui/base/ui_base_paths.cc b/ui/base/ui_base_paths.cc
index 85723b53562d596366431afe742da60b73379258..4cdf7c18e1deaa3f6261b20a3e4a5357c1ee836a 100644
--- a/ui/base/ui_base_paths.cc
+++ b/ui/base/ui_base_paths.cc
@@ -23,7 +23,7 @@ bool PathProvider(int key, base::FilePath* result) {
base::FilePath cur;
switch (key) {
- case ui::DIR_LOCALES:
+ case DIR_LOCALES:
if (!PathService::Get(base::DIR_MODULE, &cur))
return false;
#if defined(OS_MACOSX)
@@ -32,7 +32,7 @@ bool PathProvider(int key, base::FilePath* result) {
cur = cur.DirName();
cur = cur.Append(FILE_PATH_LITERAL("Resources"));
#elif defined(OS_ANDROID)
- if (!PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &cur))
+ if (!PathService::Get(DIR_RESOURCE_PAKS_ANDROID, &cur))
return false;
#else
cur = cur.Append(FILE_PATH_LITERAL("locales"));
@@ -42,17 +42,18 @@ bool PathProvider(int key, base::FilePath* result) {
// The following are only valid in the development environment, and
// will fail if executed from an installed executable (because the
// generated path won't exist).
- case ui::DIR_TEST_DATA:
+ case UI_DIR_TEST_DATA:
if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur))
return false;
- cur = cur.Append(FILE_PATH_LITERAL("app"));
+ cur = cur.Append(FILE_PATH_LITERAL("ui"));
+ cur = cur.Append(FILE_PATH_LITERAL("base"));
cur = cur.Append(FILE_PATH_LITERAL("test"));
cur = cur.Append(FILE_PATH_LITERAL("data"));
if (!base::PathExists(cur)) // we don't want to create this
return false;
break;
#if defined(OS_ANDROID)
- case ui::DIR_RESOURCE_PAKS_ANDROID:
+ case DIR_RESOURCE_PAKS_ANDROID:
if (!PathService::Get(base::DIR_ANDROID_APP_DATA, &cur))
return false;
cur = cur.Append(FILE_PATH_LITERAL("paks"));
« no previous file with comments | « ui/base/ui_base_paths.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698