diff options
| -rw-r--r-- | chrome/chrome.gyp | 9 | ||||
| -rw-r--r-- | chrome/common/chrome_paths.cc | 12 | ||||
| -rw-r--r-- | chrome/common/chrome_paths.h | 1 |
3 files changed, 15 insertions, 7 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 084ddf6..3b4f04e 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2085,6 +2085,15 @@ }, ], }], + ['OS=="mac"', { + # Copy web inspector resources to the Contents/Resources folder. + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Resources', + 'files': ['<(PRODUCT_DIR)/resources/inspector/'], + }, + ], + }], ['OS=="win"', { 'include_dirs': [ 'third_party/wtl/include', 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" |