| Index: chrome/browser/resources/tracing/interactive_tests.html
|
| diff --git a/chrome/browser/resources/tracing/timeline_test.html b/chrome/browser/resources/tracing/interactive_tests.html
|
| similarity index 85%
|
| copy from chrome/browser/resources/tracing/timeline_test.html
|
| copy to chrome/browser/resources/tracing/interactive_tests.html
|
| index f735653ec9cc9760a216d6df52ff40b9e9e6a6a9..b40c47abd78e146f282eafb65560e7ce90407fca 100644
|
| --- a/chrome/browser/resources/tracing/timeline_test.html
|
| +++ b/chrome/browser/resources/tracing/interactive_tests.html
|
| @@ -8,6 +8,8 @@ found in the LICENSE file.
|
| <head i18n-values="dir:textdirection;">
|
| <title>Interactive Timeline Tests</title>
|
| <link rel="stylesheet" href="timeline.css">
|
| +<link rel="stylesheet" href="timeline_view.css">
|
| +<link rel="stylesheet" href="overlay.css">
|
| <script src="../shared/js/cr.js"></script>
|
| <script src="../shared/js/cr/event_target.js"></script>
|
| <script src="../shared/js/cr/ui.js"></script>
|
| @@ -17,7 +19,9 @@ found in the LICENSE file.
|
| <script src="trace_event_importer.js"></script>
|
| <script src="sorted_array_utils.js"></script>
|
| <script src="measuring_stick.js"></script>
|
| +<script src="overlay.js"></script>
|
| <script src="timeline.js"></script>
|
| +<script src="timeline_view.js"></script>
|
| <script src="timeline_track.js"></script>
|
| <script src="fast_rect_renderer.js"></script>
|
| <script src="test_utils.js"></script>
|
| @@ -69,9 +73,9 @@ found in the LICENSE file.
|
| containerEl.tabIndex = 0;
|
| containerEl.style.border = '1px solid red';
|
|
|
| - var timelineEl = document.createElement('div');
|
| - cr.ui.decorate(timelineEl, tracing.Timeline);
|
| - timelineEl.focusElement = containerEl;
|
| + var timelineViewEl = document.createElement('div');
|
| + cr.ui.decorate(timelineViewEl, tracing.TimelineView);
|
| + timelineViewEl.focusElement = containerEl;
|
|
|
| parentEl.appendChild(titleEl);
|
| parentEl.appendChild(containerEl);
|
| @@ -80,12 +84,12 @@ found in the LICENSE file.
|
| // setup code.
|
| var create_detached = parentEl.getAttribute('create-attached') == 1;
|
| function createModel(data) {
|
| - timelineEl.model = new tracing.TimelineModel(data);
|
| + timelineViewEl.model = new tracing.TimelineModel(data);
|
| if (!create_detached)
|
| - containerEl.appendChild(timelineEl);
|
| + containerEl.appendChild(timelineViewEl);
|
| }
|
| if (create_detached)
|
| - containerEl.appendChild(timelineEl);
|
| + containerEl.appendChild(timelineViewEl);
|
| test_utils.getAsync(src, createModel);
|
| }
|
|
|
|
|