summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 20:09:40 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 20:09:40 +0000
commit14c3ff2fdf0f0eeca917d6158ebf7ed22d08f46e (patch)
treeb3292cd5cf8f5dd87375ff4991383c345a3cc215
parent119d8401219934b49d4205fe9eb29a819e46b63a (diff)
downloadchromium_src-14c3ff2fdf0f0eeca917d6158ebf7ed22d08f46e.zip
chromium_src-14c3ff2fdf0f0eeca917d6158ebf7ed22d08f46e.tar.gz
chromium_src-14c3ff2fdf0f0eeca917d6158ebf7ed22d08f46e.tar.bz2
net-internals: Fix modules view not displaying Windows SPIs from loaded logs.
Before this fix, it would either display nothing, or display locally installed SPIs. BUG=355753 Review URL: https://codereview.chromium.org/205123005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259314 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/net_internals/modules_view.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/resources/net_internals/modules_view.js b/chrome/browser/resources/net_internals/modules_view.js
index 68d0dc3..0bf7b52 100644
--- a/chrome/browser/resources/net_internals/modules_view.js
+++ b/chrome/browser/resources/net_internals/modules_view.js
@@ -52,8 +52,9 @@ var ModulesView = (function() {
onLoadLogFinish: function(data) {
// Show the tab if there are either service providers or extension info.
- return this.onExtensionInfoChanged(data.extensionInfo) ||
- this.onServiceProvidersChanged(data.serviceProviders);
+ var hasExtensionInfo = this.onExtensionInfoChanged(data.extensionInfo);
+ var hasSpiInfo = this.onServiceProvidersChanged(data.serviceProviders);
+ return hasExtensionInfo || hasSpiInfo;
},
onExtensionInfoChanged: function(extensionInfo) {