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.h | |
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.h')
-rw-r--r-- | chrome/common/chrome_paths.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h index 69239ad..258123d 100644 --- a/chrome/common/chrome_paths.h +++ b/chrome/common/chrome_paths.h @@ -26,7 +26,6 @@ enum { // by DOMUI and component extensions. DIR_BOOKMARK_MANAGER, // Directory containing the bookmark manager. DIR_INSPECTOR, // Directory where web inspector is located. - DIR_NET_INTERNALS, // Directory where net internals is located. DIR_APP_DICTIONARIES, // Directory where the global dictionaries are. DIR_USER_DOCUMENTS, // Directory for a user's "My Documents". DIR_DEFAULT_DOWNLOADS_SAFE, // Directory for a user's |