Commit c1a7469d authored by dsinclair's avatar dsinclair Committed by Commit bot

Sync Telemetry to trace-viewer changes.

The tvcm HTML files were shuffled around in the trace-viewer repo and moved
back up to a higher directory. The tvcm prefix was renamed to tv to show they
are no longer in tvcm itself. This CL updates the telemetry files to match
the new trace-viewer structure.

This includes the DEPs roll in order to get the new structure from
trace-viewer.

Review URL: https://codereview.chromium.org/669153009

Cr-Commit-Position: refs/heads/master@{#301123}
parent 01c9e93f
...@@ -130,7 +130,7 @@ deps = { ...@@ -130,7 +130,7 @@ deps = {
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
'src/third_party/trace-viewer': 'src/third_party/trace-viewer':
Var('chromium_git') + '/external/trace-viewer.git' + '@' + '3bf3f6d734fc2ff47a756450c5d69dfbaf7d917a', Var('chromium_git') + '/external/trace-viewer.git' + '@' + 'c3e5dde9384d641ddec8a5dcf4081fd520f0e096',
'src/third_party/WebKit': 'src/third_party/WebKit':
Var('chromium_git') + '/chromium/blink.git' + '@' + Var('webkit_revision'), Var('chromium_git') + '/chromium/blink.git' + '@' + Var('webkit_revision'),
......
...@@ -4,15 +4,15 @@ Copyright 2014 The Chromium Authors. All rights reserved. ...@@ -4,15 +4,15 @@ Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. found in the LICENSE file.
--> -->
<link rel="import" href="/tvcm/ui.html"> <link rel="import" href="/base/ui.html">
<script> <script>
'use strict'; 'use strict';
tvcm.exportTo('telemetry.web_components', function() { tv.exportTo('telemetry.web_components', function() {
/** /**
* @constructor * @constructor
*/ */
var ResultsViewer = tvcm.ui.define('x-results-viewer'); var ResultsViewer = tv.ui.define('x-results-viewer');
ResultsViewer.prototype = { ResultsViewer.prototype = {
__proto__: HTMLUnknownElement.prototype, __proto__: HTMLUnknownElement.prototype,
......
...@@ -8,7 +8,7 @@ found in the LICENSE file. ...@@ -8,7 +8,7 @@ found in the LICENSE file.
<script> <script>
'use strict'; 'use strict';
tvcm.unittest.testSuite(function() { tv.unittest.testSuite(function() {
test('testBasic', function() { test('testBasic', function() {
var resultsViewer = new telemetry.web_components.ResultsViewer(); var resultsViewer = new telemetry.web_components.ResultsViewer();
resultsViewer.dataToView = {hello: 'world', nice: ['to', 'see', 'you']}; resultsViewer.dataToView = {hello: 'world', nice: ['to', 'see', 'you']};
......
...@@ -4,7 +4,10 @@ ...@@ -4,7 +4,10 @@
from telemetry.core import util from telemetry.core import util
# Bring in tvcm module for basic JS components capabilities. # Bring in tv module for basic JS components capabilities.
util.AddDirToPythonPath(
util.GetChromiumSrcDir(), 'third_party', 'trace-viewer', 'trace_viewer')
util.AddDirToPythonPath( util.AddDirToPythonPath(
util.GetChromiumSrcDir(), util.GetChromiumSrcDir(),
'third_party', 'trace-viewer', 'third_party', 'tvcm') 'third_party', 'trace-viewer', 'third_party', 'tvcm')
......
...@@ -4,15 +4,15 @@ Copyright 2014 The Chromium Authors. All rights reserved. ...@@ -4,15 +4,15 @@ Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. found in the LICENSE file.
--> -->
<link rel="import" href="/tvcm/ui.html"> <link rel="import" href="/base/ui.html">
<script> <script>
'use strict'; 'use strict';
tvcm.exportTo('telemetry.web_components', function() { tv.exportTo('telemetry.web_components', function() {
/** /**
* @constructor * @constructor
*/ */
var SimpleViewer = tvcm.ui.define('x-results-viewer'); var SimpleViewer = tv.ui.define('x-results-viewer');
SimpleViewer.prototype = { SimpleViewer.prototype = {
__proto__: HTMLUnknownElement.prototype, __proto__: HTMLUnknownElement.prototype,
......
...@@ -11,7 +11,7 @@ document.addEventListener('DOMContentLoaded', function() { ...@@ -11,7 +11,7 @@ document.addEventListener('DOMContentLoaded', function() {
try { try {
data = JSON.parse(componentDataScript.textContent); data = JSON.parse(componentDataScript.textContent);
} catch (e) { } catch (e) {
tvcm.showPanic('Could not load data', e.stack || e); tv.showPanic('Could not load data', e.stack || e);
} }
g_results = new $js_class_name; g_results = new $js_class_name;
g_results.$data_binding_property = data; g_results.$data_binding_property = data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment