From 1408c8297755306f0d688956fbc2f93fd6d692ac Mon Sep 17 00:00:00 2001
From: "erg@chromium.org"
 <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 17 Jun 2010 00:45:34 +0000
Subject: 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
---
 chrome/common/chrome_paths.cc | 5 +++++
 chrome/common/chrome_paths.h  | 1 +
 2 files changed, 6 insertions(+)

(limited to 'chrome/common')

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
diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h
index 258123d..69239ad 100644
--- a/chrome/common/chrome_paths.h
+++ b/chrome/common/chrome_paths.h
@@ -26,6 +26,7 @@ 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
-- 
cgit v1.1