Commit 07f92466 authored by Joon Ahn's avatar Joon Ahn Committed by Commit Bot

Diagnostics: Wire realtime cpu chart into cpu card

https://screenshot.googleplex.com/7fXF2GjLWEPcAbs

Bug: 1125150
Test: browser_tests --gtest_filter=DiagnosticsApp*
Change-Id: I77af9ea199c2363636471d3b2b8b1ef739fdc1ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2441531
Commit-Queue: Joon Ahn <joonbug@chromium.org>
Reviewed-by: default avatarZentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813981}
parent a42427fb
...@@ -64,6 +64,11 @@ suite('CpuCardTest', () => { ...@@ -64,6 +64,11 @@ suite('CpuCardTest', () => {
assertEquals(currentlyUsingValue, dataPoints[0].value); assertEquals(currentlyUsingValue, dataPoints[0].value);
assertEquals( assertEquals(
fakeCpuUsage[0].cpu_temp_degrees_celcius, dataPoints[1].value); fakeCpuUsage[0].cpu_temp_degrees_celcius, dataPoints[1].value);
const cpuChart =
diagnostics_test_utils.getRealtimeCpuChartElement(cpuElement);
assertEquals(fakeCpuUsage[0].percent_usage_user, cpuChart.user);
assertEquals(fakeCpuUsage[0].percent_usage_system, cpuChart.system);
}); });
}); });
}); });
\ No newline at end of file
...@@ -20,4 +20,14 @@ export function getDataPointElements(element) { ...@@ -20,4 +20,14 @@ export function getDataPointElements(element) {
*/ */
export function getPercentBarChartElement(element) { export function getPercentBarChartElement(element) {
return element.shadowRoot.querySelector('percent-bar-chart'); return element.shadowRoot.querySelector('percent-bar-chart');
} }
\ No newline at end of file
/**
* Helper function for getting a realtime-cpu-chart element from a
* diagnostics card.
* @param {!HTMLElement} element
* @return {!Array<!HTMLElement>}
*/
export function getRealtimeCpuChartElement(element) {
return element.shadowRoot.querySelector('realtime-cpu-chart');
}
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
<diagnostics-card> <diagnostics-card>
<div id="cardTitle" slot="title">[[i18n('cpuTitle')]]</div> <div id="cardTitle" slot="title">[[i18n('cpuTitle')]]</div>
<!-- TODO(michaelcheco): Add i18n string for percent number format --> <!-- TODO(michaelcheco): Add i18n string for percent number format -->
<realtime-cpu-chart slot="left-panel" id="realtimeCpuChart"
user="[[cpuUsage_.percent_usage_user]]"
system="[[cpuUsage_.percent_usage_system]]">
</realtime-cpu-chart>
<data-point slot="body" id="cpuUsageUser" <data-point slot="body" id="cpuUsageUser"
value="[[computeCurrentlyUsing_(cpuUsage_.percent_usage_system, value="[[computeCurrentlyUsing_(cpuUsage_.percent_usage_system,
cpuUsage_.percent_usage_user)]]"> cpuUsage_.percent_usage_user)]]">
......
...@@ -5,8 +5,10 @@ ...@@ -5,8 +5,10 @@
import './data_point.js'; import './data_point.js';
import './diagnostics_card.js'; import './diagnostics_card.js';
import './diagnostics_shared_css.js'; import './diagnostics_shared_css.js';
import './realtime_cpu_chart.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {CpuUsage, SystemDataProviderInterface} from './diagnostics_types.js' import {CpuUsage, SystemDataProviderInterface} from './diagnostics_types.js'
import {getSystemDataProvider} from './mojo_interface_provider.js'; import {getSystemDataProvider} from './mojo_interface_provider.js';
import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js'; import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
......
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