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

Unified Diff: chrome/common/chrome_paths.cc

Issue 2799022: Speculatively revert 50374 (miniinstaller breakage) - Load netinternals resou... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
===================================================================
--- chrome/common/chrome_paths.cc (revision 50391)
+++ chrome/common/chrome_paths.cc (working copy)
@@ -168,6 +168,11 @@
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
@@ -245,16 +250,6 @@
#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') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698