summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/net_internals
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-10 16:19:37 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-10 16:19:37 +0000
commit9e652efa6c344124a68a41ae41867a3b6b911666 (patch)
tree5c480f45c0356f0da2943eaf5934ac74f2bfecc1 /chrome/browser/resources/net_internals
parent7fee5d3f325eaa4edf4dde86f8790bfb041d738b (diff)
downloadchromium_src-9e652efa6c344124a68a41ae41867a3b6b911666.zip
chromium_src-9e652efa6c344124a68a41ae41867a3b6b911666.tar.gz
chromium_src-9e652efa6c344124a68a41ae41867a3b6b911666.tar.bz2
Revert 62115 - Adds a list of kernel extensions to the net-internals screen on Macs
Fixed version of http://codereview.chromium.org/3611003/show BUG=56697 TEST=manual Review URL: http://codereview.chromium.org/3548023 TBR=mmenke@chromium.org Review URL: http://codereview.chromium.org/3701002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/net_internals')
-rw-r--r--chrome/browser/resources/net_internals/dataview.js15
-rw-r--r--chrome/browser/resources/net_internals/index.html8
-rw-r--r--chrome/browser/resources/net_internals/kernelextensionsview.js32
-rw-r--r--chrome/browser/resources/net_internals/main.css1
-rw-r--r--chrome/browser/resources/net_internals/main.js36
5 files changed, 1 insertions, 91 deletions
diff --git a/chrome/browser/resources/net_internals/dataview.js b/chrome/browser/resources/net_internals/dataview.js
index 3d9cbc1..58aaccf 100644
--- a/chrome/browser/resources/net_internals/dataview.js
+++ b/chrome/browser/resources/net_internals/dataview.js
@@ -263,21 +263,6 @@ DataView.prototype.onUpdateAllCompleted = function(data) {
}
}
- if (g_browser.isPlatformMac()) {
- text.push('');
- text.push('----------------------------------------------');
- text.push(' Kernel extensions');
- text.push('----------------------------------------------');
- text.push('');
-
- var kernelExtensions = data.kernelExtensions;
- if (!kernelExtensions) {
- text.push('No data');
- } else {
- text.push(kernelExtensions);
- }
- }
-
// Open a new window to display this text.
this.setText_(text.join('\n'));
diff --git a/chrome/browser/resources/net_internals/index.html b/chrome/browser/resources/net_internals/index.html
index c258d2e..1ab90e6 100644
--- a/chrome/browser/resources/net_internals/index.html
+++ b/chrome/browser/resources/net_internals/index.html
@@ -26,7 +26,6 @@ found in the LICENSE file.
<script src="socketpoolwrapper.js"></script>
<script src="socketsview.js"></script>
<script src="serviceprovidersview.js"></script>
- <script src="kernelextensionsview.js"></script>
</head>
<body onload="onLoaded()">
<!-- Tab switcher for main categories. -->
@@ -40,8 +39,6 @@ found in the LICENSE file.
<li><a href="#httpCache" id=httpCacheTab>HTTP Cache</a></li>
<!-- Tab is only shown on Windows -->
<li><a href="#serviceProviders" id=serviceProvidersTab style="display: none;">SPIs</a></li>
- <!-- Tab is only shown on Mac -->
- <li><a href="#kernelExtensions" id=kernelExtensionsTab style="display: none;">Kexts</a></li>
<li><a href="#tests" id=testTab>Tests</a></li>
</ul>
<div style="clear: both;"></div>
@@ -172,11 +169,6 @@ found in the LICENSE file.
</tbody>
</table>
</div>
- <!-- Only shown on Mac -->
- <div id=kernelExtensionsTabContent style="display: none;">
- <h4>Kernel extensions</h4>
- <pre id=kernelExtensionsText></pre>
- </div>
<!-- Import/Export data -->
<div id=dataTabContent>
diff --git a/chrome/browser/resources/net_internals/kernelextensionsview.js b/chrome/browser/resources/net_internals/kernelextensionsview.js
deleted file mode 100644
index 22eadca..0000000
--- a/chrome/browser/resources/net_internals/kernelextensionsview.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/**
- * This view displays information on loaded Mac kernel extensions.
- *
- * Displays the output from running kexstat.
- *
- * @constructor
- */
-function KernelExtensionsView(tabId, mainBoxId, textPReId) {
- DivView.call(this, mainBoxId);
-
- var tab = document.getElementById(tabId);
- setNodeDisplay(tab, true);
- this.textPre_ = document.getElementById(textPReId);
-
- g_browser.addKernelExtensionsObserver(this);
-}
-
-inherits(KernelExtensionsView, DivView);
-
-KernelExtensionsView.prototype.onKernelExtensionsChanged =
-function(kernelExtensionsText) {
- this.textPre_.innerHTML = '';
- if (kernelExtensionsText == null) {
- addTextNode(this.textPre_, 'No data');
- } else {
- addTextNode(this.textPre_, kernelExtensionsText);
- }
-};
diff --git a/chrome/browser/resources/net_internals/main.css b/chrome/browser/resources/net_internals/main.css
index 3b2e10e..0102cfb 100644
--- a/chrome/browser/resources/net_internals/main.css
+++ b/chrome/browser/resources/net_internals/main.css
@@ -203,7 +203,6 @@ body {
#dnsTabContent,
#socketsTabContent,
#serviceProvidersTabContent,
-#kernelExtensionsTabContent,
#testTabContent {
overflow: auto;
padding: 10px;
diff --git a/chrome/browser/resources/net_internals/main.js b/chrome/browser/resources/net_internals/main.js
index be5fc33..50102c6 100644
--- a/chrome/browser/resources/net_internals/main.js
+++ b/chrome/browser/resources/net_internals/main.js
@@ -89,6 +89,7 @@ function onLoaded() {
"socketPoolDiv",
"socketPoolGroupsDiv");
+
var serviceView;
if (g_browser.isPlatformWindows()) {
serviceView = new ServiceProvidersView("serviceProvidersTab",
@@ -97,13 +98,6 @@ function onLoaded() {
"namespaceProvidersTbody");
}
- var extensionsView;
- if (g_browser.isPlatformMac()) {
- extensionsView = new KernelExtensionsView("kernelExtensionsTab",
- "kernelExtensionsTabContent",
- "kernelExtensionsText");
- }
-
// Create a view which lets you tab between the different sub-views.
var categoryTabSwitcher =
new TabSwitcherView(new DivView('categoryTabHandles'));
@@ -117,8 +111,6 @@ function onLoaded() {
categoryTabSwitcher.addTab('dataTab', dataView, false);
if (g_browser.isPlatformWindows())
categoryTabSwitcher.addTab('serviceProvidersTab', serviceView, false);
- if (g_browser.isPlatformMac())
- categoryTabSwitcher.addTab('kernelExtensionsTab', extensionsView, false);
categoryTabSwitcher.addTab('testTab', testView, false);
// Build a map from the anchor name of each tab handle to its "tab ID".
@@ -179,10 +171,6 @@ function BrowserBridge() {
this.pollableDataHelpers_.serviceProviders =
new PollableDataHelper('onServiceProvidersChanged',
this.sendGetServiceProviders.bind(this));
- } else if (this.isPlatformMac()) {
- this.pollableDataHelpers_.kernelExtensions =
- new PollableDataHelper('onKernelExtensionsChanged',
- this.sendGetKernelExtensions.bind(this));
}
// Cache of the data received.
@@ -248,10 +236,6 @@ BrowserBridge.prototype.isPlatformWindows = function() {
return /Win/.test(navigator.platform);
};
-BrowserBridge.prototype.isPlatformMac = function() {
- return /Mac/.test(navigator.platform);
-};
-
BrowserBridge.prototype.sendGetProxySettings = function() {
// The browser will call receivedProxySettings on completion.
chrome.send('getProxySettings');
@@ -295,10 +279,6 @@ BrowserBridge.prototype.sendGetServiceProviders = function() {
chrome.send('getServiceProviders');
};
-BrowserBridge.prototype.sendGetKernelExtensions = function() {
- chrome.send('getKernelExtensions');
-};
-
BrowserBridge.prototype.enableIPv6 = function() {
chrome.send('enableIPv6');
};
@@ -378,10 +358,6 @@ BrowserBridge.prototype.receivedServiceProviders = function(serviceProviders) {
this.pollableDataHelpers_.serviceProviders.update(serviceProviders);
};
-BrowserBridge.prototype.receivedKernelExtensions = function(kernelExtensions) {
- this.pollableDataHelpers_.kernelExtensions.update(kernelExtensions);
-};
-
BrowserBridge.prototype.receivedPassiveLogEntries = function(entries) {
this.numPassivelyCapturedEvents_ += entries.length;
for (var i = 0; i < entries.length; ++i) {
@@ -509,16 +485,6 @@ BrowserBridge.prototype.addServiceProvidersObserver = function(observer) {
};
/**
- * Adds a listener of the kernel extensions. |observer| will be called
- * back when data is received, through:
- *
- * observer.onKernelExtensionsChanged(kernelExtensions)
- */
-BrowserBridge.prototype.addKernelExtensionsObserver = function(observer) {
- this.pollableDataHelpers_.kernelExtensions.addObserver(observer);
-};
-
-/**
* Adds a listener for the progress of the connection tests.
* The observer will be called back with:
*
generated by cgit v1.1 at 2025-01-07 10:34:03 +0000