diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 19:14:45 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 19:14:45 +0000 |
| commit | fbbcbaf43b973f38cfd00cedf048f0cb3655a5e7 (patch) | |
| tree | 6fa777ca5fd465b7058175709250313ed67041ee /chrome/browser | |
| parent | e736aa90070a20d233adae2405790cd53a476ece (diff) | |
| download | chromium_src-fbbcbaf43b973f38cfd00cedf048f0cb3655a5e7.zip chromium_src-fbbcbaf43b973f38cfd00cedf048f0cb3655a5e7.tar.gz chromium_src-fbbcbaf43b973f38cfd00cedf048f0cb3655a5e7.tar.bz2 | |
Add an OWNERS file for the about:profiler javascript code.
Review URL: http://codereview.chromium.org/8832001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 4 | ||||
| -rw-r--r-- | chrome/browser/resources/profiler/OWNERS | 2 | ||||
| -rw-r--r-- | chrome/browser/resources/profiler/profiler.html (renamed from chrome/browser/resources/profiler.html) | 0 | ||||
| -rw-r--r-- | chrome/browser/resources/profiler/profiler.js (renamed from chrome/browser/resources/profiler.js) | 0 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/profiler_ui.cc | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 222a538..34b3d19 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -93,8 +93,8 @@ <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_preview.js" flattenhtml="true" type="BINDATA" /> - <include name="IDR_PROFILER_HTML" file="resources\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> - <include name="IDR_PROFILER_JS" file="resources\profiler.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_date.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_browsing_malware_block.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\safe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> diff --git a/chrome/browser/resources/profiler/OWNERS b/chrome/browser/resources/profiler/OWNERS new file mode 100644 index 0000000..332611a --- /dev/null +++ b/chrome/browser/resources/profiler/OWNERS @@ -0,0 +1,2 @@ +eroman@chromium.org +jar@chromium.org diff --git a/chrome/browser/resources/profiler.html b/chrome/browser/resources/profiler/profiler.html index 53db962..53db962 100644 --- a/chrome/browser/resources/profiler.html +++ b/chrome/browser/resources/profiler/profiler.html diff --git a/chrome/browser/resources/profiler.js b/chrome/browser/resources/profiler/profiler.js index c49a25f..c49a25f 100644 --- a/chrome/browser/resources/profiler.js +++ b/chrome/browser/resources/profiler/profiler.js diff --git a/chrome/browser/ui/webui/profiler_ui.cc b/chrome/browser/ui/webui/profiler_ui.cc index 77d7c15..9b853383 100644 --- a/chrome/browser/ui/webui/profiler_ui.cc +++ b/chrome/browser/ui/webui/profiler_ui.cc @@ -60,6 +60,7 @@ class ProfilerWebUIDataSource : public ChromeURLDataManager::DataSource { base_path = base_path.AppendASCII("chrome"); base_path = base_path.AppendASCII("browser"); base_path = base_path.AppendASCII("resources"); + base_path = base_path.AppendASCII("profiler"); // If no resource was specified, default to profiler.html. std::string filename = path.empty() ? "profiler.html" : path; |