diff options
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 15 | ||||
| -rw-r--r-- | chrome/common/chrome_paths.h | 1 |
2 files changed, 10 insertions, 6 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 9dca7e0..738ee3a 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -168,11 +168,6 @@ bool PathProvider(int key, FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("inspector")); break; - case chrome::DIR_NET_INTERNALS: - if (!PathService::Get(chrome::DIR_RESOURCES, &cur)) - return false; - cur = cur.Append(FILE_PATH_LITERAL("net_internals")); - break; case chrome::DIR_APP_DICTIONARIES: #if defined(OS_LINUX) || defined(OS_MACOSX) // We can't write into the EXE dir on Linux, so keep dictionaries @@ -250,6 +245,16 @@ bool PathProvider(int key, FilePath* result) { #endif break; case chrome::FILE_RESOURCES_PACK: +#if defined(OS_MACOSX) + if (mac_util::AmIBundled()) { + cur = mac_util::MainAppBundlePath(); + cur = cur.Append(FILE_PATH_LITERAL("Resources")) + .Append(FILE_PATH_LITERAL("resources.pak")); + break; + } + // If we're not bundled on mac, resources.pak should be next to the + // binary (e.g., for unit tests). +#endif if (!PathService::Get(base::DIR_EXE, &cur)) return false; cur = cur.Append(FILE_PATH_LITERAL("resources.pak")); diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h index 69239ad..258123d 100644 --- a/chrome/common/chrome_paths.h +++ b/chrome/common/chrome_paths.h @@ -26,7 +26,6 @@ enum { // by DOMUI and component extensions. DIR_BOOKMARK_MANAGER, // Directory containing the bookmark manager. DIR_INSPECTOR, // Directory where web inspector is located. - DIR_NET_INTERNALS, // Directory where net internals is located. DIR_APP_DICTIONARIES, // Directory where the global dictionaries are. DIR_USER_DOCUMENTS, // Directory for a user's "My Documents". DIR_DEFAULT_DOWNLOADS_SAFE, // Directory for a user's |