diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 17:36:39 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 17:36:39 +0000 |
| commit | 044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d (patch) | |
| tree | 53becf6424efc668da228eebd3685ba2bdc53398 /chrome/common/chrome_paths.cc | |
| parent | ad4f19d37519b5b9aef6d3e1f59f9d5802d39437 (diff) | |
| download | chromium_src-044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d.zip chromium_src-044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d.tar.gz chromium_src-044f5a95bef0ef8a672a9ce163d7a45bbc96dc5d.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths.cc')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 9dca7e0..b0559688 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 |