diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-21 07:07:49 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-21 07:07:49 +0000 |
| commit | 00f36bd395891e8ee134ca9f8a0c99b0f846aa85 (patch) | |
| tree | ae8cb2bf4a22d64c2869fe28696104e66cccad25 /chrome/common | |
| parent | 841803c39354971f380399cd2dfeacbc5e0e245c (diff) | |
| download | chromium_src-00f36bd395891e8ee134ca9f8a0c99b0f846aa85.zip chromium_src-00f36bd395891e8ee134ca9f8a0c99b0f846aa85.tar.gz chromium_src-00f36bd395891e8ee134ca9f8a0c99b0f846aa85.tar.bz2 | |
DevTools: On Mac, deploy inspector resources into <app_name>/Contents/Resources and read them from there.
Review URL: http://codereview.chromium.org/115587
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 12 | ||||
| -rw-r--r-- | chrome/common/chrome_paths.h | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 1c307ed..d4f2f16 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -80,17 +80,17 @@ bool PathProvider(int key, FilePath* result) { if (!GetUserDesktop(&cur)) return false; break; - case chrome::DIR_RESOURCES: - if (!PathService::Get(chrome::DIR_APP, &cur)) - return false; - cur = cur.Append(FILE_PATH_LITERAL("resources")); - create_dir = true; - break; case chrome::DIR_INSPECTOR: if (!PathService::Get(chrome::DIR_APP, &cur)) return false; +#if defined(OS_MACOSX) + cur = cur.DirName(); + cur = cur.Append(FILE_PATH_LITERAL("Resources")); + cur = cur.Append(FILE_PATH_LITERAL("inspector")); +#else cur = cur.Append(FILE_PATH_LITERAL("resources")); cur = cur.Append(FILE_PATH_LITERAL("inspector")); +#endif break; case chrome::DIR_APP_DICTIONARIES: #if defined(OS_LINUX) diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h index 9f5b3cf..811fe57 100644 --- a/chrome/common/chrome_paths.h +++ b/chrome/common/chrome_paths.h @@ -18,7 +18,6 @@ enum { DIR_USER_DATA, // directory where user data can be written DIR_CRASH_DUMPS, // directory where crash dumps are written DIR_USER_DESKTOP, // directory that correspond to the desktop - DIR_RESOURCES, // directory where application resources are stored DIR_INSPECTOR, // directory where web inspector is located DIR_APP_DICTIONARIES, // directory where the global dictionaries are DIR_USER_DOCUMENTS, // directory for a user's "My Documents" |