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-17 00:45:34 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 00:45:34 +0000
commit1408c8297755306f0d688956fbc2f93fd6d692ac (patch)
tree50997a29208c8505961d7fd8634b7abd2a632c5c /chrome/common/chrome_paths.cc
parentc01c61d5d1b86b72e4e1ee4a96870196a8057644 (diff)
downloadchromium_src-1408c8297755306f0d688956fbc2f93fd6d692ac.zip
chromium_src-1408c8297755306f0d688956fbc2f93fd6d692ac.tar.gz
chromium_src-1408c8297755306f0d688956fbc2f93fd6d692ac.tar.bz2
Revert 50057 - Load net-internals from the newly created resources.pak file.
This patch also forces the loading of the optional DataPack for const correctness reasons BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2855003 TBR=erg@chromium.org Review URL: http://codereview.chromium.org/2852011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50059 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