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

Unified Diff: chrome/browser/resources/inspect/inspect.js

Issue 562513003: [DevTools] Unify workers and web contents handling in inspect_ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased, fixed comment Created 6 years, 3 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
« no previous file with comments | « chrome/browser/devtools/devtools_targets_ui.cc ('k') | chrome/browser/ui/webui/inspect_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/inspect/inspect.js
diff --git a/chrome/browser/resources/inspect/inspect.js b/chrome/browser/resources/inspect/inspect.js
index a5bcb2f8bb2fe72ad8efb5c792e4165c3c513d4a..a4a27587318407bca84ba7d7e64b920c474335df 100644
--- a/chrome/browser/resources/inspect/inspect.js
+++ b/chrome/browser/resources/inspect/inspect.js
@@ -137,21 +137,20 @@ function populateServiceWorkers(partition_id, workers) {
}
function populateTargets(source, data) {
- if (source == 'renderers')
- populateWebContentsTargets(data);
- else if (source == 'workers')
- populateWorkerTargets(data);
- else if (source == 'adb')
+ if (source == 'local')
+ populateLocalTargets(data);
+ else if (source == 'remote')
populateRemoteTargets(data);
else
console.error('Unknown source type: ' + source);
}
-function populateWebContentsTargets(data) {
+function populateLocalTargets(data) {
removeChildren('pages-list');
removeChildren('extensions-list');
removeChildren('apps-list');
removeChildren('others-list');
+ removeChildren('workers-list');
for (var i = 0; i < data.length; i++) {
if (data[i].type === 'page')
@@ -160,18 +159,13 @@ function populateWebContentsTargets(data) {
addToExtensionsList(data[i]);
else if (data[i].type === 'app')
addToAppsList(data[i]);
+ else if (data[i].type === 'worker')
+ addToWorkersList(data[i]);
else
addToOthersList(data[i]);
}
}
-function populateWorkerTargets(data) {
- removeChildren('workers-list');
-
- for (var i = 0; i < data.length; i++)
- addToWorkersList(data[i]);
-}
-
function showIncognitoWarning() {
$('devices-incognito').hidden = false;
}
« no previous file with comments | « chrome/browser/devtools/devtools_targets_ui.cc ('k') | chrome/browser/ui/webui/inspect_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698