Add trace-viewer to third party and redirect about:tracing to that implementation.

Review URL: https://chromiumcodereview.appspot.com/10546068

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

7 files changed, 18 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 98813c2..6d9a669 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,6 +196,7 @@ v8.log
 /third_party/swig
 /third_party/syzygy
 /third_party/syzygy/binaries
+/third_party/trace-viewer
 /third_party/undoview
 /third_party/v8-i18n
 /third_party/valgrind
diff --git a/DEPS b/DEPS
index f55be33..646f193 100644
--- a/DEPS
+++ b/DEPS
@@ -88,6 +88,9 @@ deps = {
   "src/third_party/angle":
     (Var("googlecode_url") % "angleproject") + "/trunk@1046",
 
+  "src/third_party/trace-viewer":
+    (Var("googlecode_url") % "trace-viewer") + "/trunk@12",
+
   # Note that this is *not* where we check out WebKit -- this just
   # puts some extra files into place for the real WebKit checkout to
   # happen.  See lines mentioning "webkit_revision" for the real
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 080addd..59ca615 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -134,8 +134,6 @@
       <include name="IDR_SESSIONS_JS" file="resources\sessions.js" flattenhtml="true" type="BINDATA" />
       <include name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.html" flattenhtml="true" type="BINDATA" />
-      <include name="IDR_TRACING_HTML" file="resources\tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
-      <include name="IDR_TRACING_JS" file="resources\tracing.js" flattenhtml="true" type="BINDATA" />
       <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDATA" />
       <include name="IDR_FEEDBACK_HTML" file="resources\feedback.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
       <include name="IDR_FEEDBACK_HTML_INVALID" file="resources\feedback_invalid.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />
diff --git a/chrome/browser/ui/webui/tracing_ui.cc b/chrome/browser/ui/webui/tracing_ui.cc
index 58cf5bb..97948e7 100644
--- a/chrome/browser/ui/webui/tracing_ui.cc
+++ b/chrome/browser/ui/webui/tracing_ui.cc
@@ -32,7 +32,7 @@
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_message_handler.h"
-#include "grit/browser_resources.h"
+#include "grit/tracing_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
index 6ac6632..4b0b181 100644
--- a/chrome/chrome_repack_chrome.gypi
+++ b/chrome/chrome_repack_chrome.gypi
@@ -9,6 +9,7 @@
       '<(grit_out_dir)/common_resources.pak',
       '<(grit_out_dir)/renderer_resources.pak',
       '<(grit_out_dir)/theme_resources.pak',
+      '<(grit_out_dir)/tracing_resources.pak',
       '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
       '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
       '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak',
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 89538e1..f17dbe9 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -114,7 +114,15 @@
             'grit_grd_file': 'common/extensions_api_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
-        }
+        },
+        {
+          'action_name': 'tracing_resources',
+          'variables': {
+            'grit_grd_file': '../third_party/trace-viewer/src/tracing.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index f9bc35e..1933a66 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -199,4 +199,7 @@
   "chrome/common/extensions_api_resources.grd": {
     "includes": [26000],
   },
+  "third_party/trace-viewer/src/tracing.grd": {
+    "includes": [26500],
+  },
 }