summaryrefslogtreecommitdiffstats
path: root/content/browser/tracing/tracing_ui.cc
diff options
context:
space:
mode:
authordsinclair@chromium.org <dsinclair@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 21:46:06 +0000
committerdsinclair@chromium.org <dsinclair@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 21:46:06 +0000
commit479bea2b5cac4accf53c2cd4f15cfa021d329812 (patch)
tree8f4b8e9d400b00e82e3587892e104b1cdbfb0b04 /content/browser/tracing/tracing_ui.cc
parent3cd05bc98b36bac8524f19e305ec1b2ba68301ea (diff)
downloadchromium_src-479bea2b5cac4accf53c2cd4f15cfa021d329812.zip
chromium_src-479bea2b5cac4accf53c2cd4f15cfa021d329812.tar.gz
chromium_src-479bea2b5cac4accf53c2cd4f15cfa021d329812.tar.bz2
Generate files needed for tracing through the build.
Currently the about_tracing.html and about_tracing.js files are all committed into the trace-viewer repo. This causes a lot of churn. With this CL, when combined with the CL on the tracing side, we generate the needed files during the chromium build. Pairs with: https://codereview.appspot.com/9126044/ BUG=trace-viewer:152 TBR=dsinclair@chromium.org (for the grit dep) Review URL: https://chromiumcodereview.appspot.com/14990007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tracing/tracing_ui.cc')
-rw-r--r--content/browser/tracing/tracing_ui.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc
index 8553f8f..aab652d 100644
--- a/content/browser/tracing/tracing_ui.cc
+++ b/content/browser/tracing/tracing_ui.cc
@@ -29,7 +29,7 @@
#include "content/public/browser/web_ui_data_source.h"
#include "content/public/browser/web_ui_message_handler.h"
#include "content/public/common/url_constants.h"
-#include "grit/content_resources.h"
+#include "grit/tracing_resources.h"
#include "ipc/ipc_channel.h"
#include "ui/shell_dialogs/select_file_dialog.h"