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

Unified Diff: chrome/common/chrome_paths.cc

Issue 2865010: Load net-internals resources from resources.pak. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: mini installer 2 Created 10 years, 6 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 | « chrome/common/chrome_paths.h ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 9dca7e037a6f7a3937abcf9c15581f5dfee7040a..738ee3ae6b19bf5d3f3a7d9a5fd831a406e3c14a 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"));
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698