Speculatively revert 50374 (miniinstaller breakage) - Load netinternals resources from resources.pak.

This is the same as r50257 with 2 fixes:
1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will
work for things tests.
2) Add back the check in chrome_paths.cc to see if we're in a
mac bundle or not.

BUG=35793,42770
TEST=none

Review URL: http://codereview.chromium.org/2865010

TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/2799022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50392 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 35 insertions, 2 deletions

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ab72412..37f8ea4 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -17,6 +17,7 @@
         'chrome_version_info',
         'component_extensions',
         'domui_shared_resources',
+        'net_internals_resources',
         'platform_locale_settings',
         'profile_import',
         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
@@ -2685,9 +2686,8 @@
         'browser/zygote_host_linux.cc',
         'browser/zygote_main_linux.cc',
 
-        # These files are generated by GRIT.
+        # This file is generated by GRIT.
         '<(grit_out_dir)/grit/theme_resources_map.cc',
-        '<(grit_out_dir)/grit/net_internals_resources_map.cc',
       ],
       'conditions': [
         ['javascript_engine=="v8"', {
@@ -3555,6 +3555,39 @@
       ],
     },
     {
+      'target_name': 'net_internals_resources',
+      'type': 'none',
+      # TODO(eroman): Once the msvs port supports it, change this to recursively
+      # copy the entire directory instead of listing the files.
+      # http://code.google.com/p/gyp/issues/detail?id=143.
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)/resources/net_internals',
+          'files': [
+            'browser/resources/net_internals/dataview.js',
+            'browser/resources/net_internals/detailsview.js',
+            'browser/resources/net_internals/dnsview.js',
+            'browser/resources/net_internals/httpcacheview.js',
+            'browser/resources/net_internals/index.html',
+            'browser/resources/net_internals/loggrouper.js',
+            'browser/resources/net_internals/logviewpainter.js',
+            'browser/resources/net_internals/main.css',
+            'browser/resources/net_internals/main.js',
+            'browser/resources/net_internals/proxyview.js',
+            'browser/resources/net_internals/requestsview.js',
+            'browser/resources/net_internals/resizableverticalsplitview.js',
+            'browser/resources/net_internals/sourceentry.js',
+            'browser/resources/net_internals/tabswitcherview.js',
+            'browser/resources/net_internals/testview.js',
+            'browser/resources/net_internals/timelineviewpainter.js',
+            'browser/resources/net_internals/topmidbottomview.js',
+            'browser/resources/net_internals/util.js',
+            'browser/resources/net_internals/view.js',
+          ]
+        },
+      ]
+    },
+    {
       # Protobuf compiler / generate rule for feedback
       'target_name': 'userfeedback_proto',
       'type': 'none',