Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(289)

Unified Diff: chrome/browser/resources/gpu_internals.html

Issue 6551019: Trace_event upgrades (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More gooder js thanks to arv. Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/gpu_internals.html
diff --git a/chrome/browser/resources/gpu_internals.html b/chrome/browser/resources/gpu_internals.html
index 0a39277a9adf5fa71252a5bf68e06bf21530d93e..83a9b280581b35e05a727e6c7c323990e2ef2fa7 100644
--- a/chrome/browser/resources/gpu_internals.html
+++ b/chrome/browser/resources/gpu_internals.html
@@ -25,33 +25,42 @@ body {
</style>
<link rel="stylesheet" href="gpu_internals/tab_control.css">
<link rel="stylesheet" href="gpu_internals/info_view.css">
+<link rel="stylesheet" href="gpu_internals/raw_events_view.css">
+<link rel="stylesheet" href="gpu_internals/overlay.css">
+<link rel="stylesheet" href="gpu_internals/tracing_controller.css">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script>
<script src="chrome://resources/js/cr/ui.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="gpu_internals/tab_control.js"></script>
+<script src="gpu_internals/overlay.js"></script>
<script src="gpu_internals/browser_bridge.js"></script>
+<script src="gpu_internals/tracing_controller.js"></script>
<script src="gpu_internals/info_view.js"></script>
+<script src="gpu_internals/raw_events_view.js"></script>
<script>
var browser;
+var tracingController;
/**
* Main entry point. called once the page has loaded.
*/
function onLoad() {
browserBridge = new gpu.BrowserBridge();
+ tracingController = new gpu.TracingController();
// Create the views.
cr.ui.decorate('#info-view', gpu.InfoView);
+ cr.ui.decorate('#raw-events-view', gpu.RawEventsView);
// Create the main tab control
var tabs = $('main-tabs');
cr.ui.decorate(tabs, gpu.TabControl);
// Sync the main-tabs selectedTabs in-sync with the location.
- tabs.addEventListener('selectedTabChanged', function() {
+ tabs.addEventListener('selectedTabChange', function() {
if (tabs.selectedTab.id) {
history.pushState('', '', '#' + tabs.selectedTab.id);
}
@@ -75,9 +84,13 @@ document.addEventListener('DOMContentLoaded', onLoad);
</script>
</head>
<body>
+
<!-- Tabs -->
<div id="main-tabs">
<include src="gpu_internals/info_view.html">
+ <include src="gpu_internals/raw_events_view.html">
</div>
+
+ <include src="gpu_internals/tracing_controller.html">
</body>
</html>

Powered by Google App Engine
This is Rietveld 408576698