summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_paths.cc
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 17:52:50 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 17:52:50 +0000
commita223028a2c2d8113c9dbad9681e65268a8229b9a (patch)
treed373afb061ef288a94dd632a9fcbed9c7805141f /chrome/common/chrome_paths.cc
parent53ae7c4c5f08e73d66ef8b2303691d893f5d9e47 (diff)
downloadchromium_src-a223028a2c2d8113c9dbad9681e65268a8229b9a.zip
chromium_src-a223028a2c2d8113c9dbad9681e65268a8229b9a.tar.gz
chromium_src-a223028a2c2d8113c9dbad9681e65268a8229b9a.tar.bz2
Revert 50257 - Reland r50057. This is exactly the same except with two lines cherrypicked from
tony's CL 2814009 that tell make about the net_internals_resources_map.{cc,h} files. Load net-internals from the newly created resources.pak file. This patch also forces the loading of the optional DataPack for const correctness reasons Original Review: http://codereview.chromium.org/2855003 BUG=35793,42770 TEST=none TBR=tony Review URL: http://codereview.chromium.org/2800014 TBR=erg@chromium.org Review URL: http://codereview.chromium.org/2811016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths.cc')
-rw-r--r--chrome/common/chrome_paths.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index b0559688..9dca7e0 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -168,6 +168,11 @@ 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