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

Unified Diff: chrome/common/chrome_paths.cc

Issue 2855003: Load net-internals from the newly created resources.pak file. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Work with mac bundles 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') | no next file » | 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..0bf9a7d1e65cc0bdd6b4c0a8e7c3fce3fec2887c 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,8 +245,13 @@ bool PathProvider(int key, FilePath* result) {
#endif
break;
case chrome::FILE_RESOURCES_PACK:
+#if defined(OS_MACOSX)
+ cur = mac_util::MainAppBundlePath();
+ cur = cur.Append(FILE_PATH_LITERAL("Resources"));
tony 2010/06/17 00:16:21 Ah yes, this looks right.
+#else // Linux/Windows/ChromeOS
if (!PathService::Get(base::DIR_EXE, &cur))
return false;
+#endif
cur = cur.Append(FILE_PATH_LITERAL("resources.pak"));
break;
#if defined(OS_CHROMEOS)
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698