| Index: components/net_log/resources/net_export.js
|
| diff --git a/components/net_log/resources/net_export.js b/components/net_log/resources/net_export.js
|
| index b13b90d4859f0155cf417c4b04abb4c940a2525d..3ea73c575b65bffa1dafa1187a44ac01e5ce807b 100644
|
| --- a/components/net_log/resources/net_export.js
|
| +++ b/components/net_log/resources/net_export.js
|
| @@ -26,7 +26,8 @@ var NetExportView = (function() {
|
| function NetExportView() {
|
| $('export-view-start-data').onclick = this.onStartData_.bind(this);
|
| $('export-view-stop-data').onclick = this.onStopData_.bind(this);
|
| - $('export-view-send-data').onclick = this.onSendData_.bind(this);
|
| + if (this.useMobileUI_())
|
| + $('export-view-mobile-send-data').onclick = this.onSendData_.bind(this);
|
|
|
| // Tell NetExportMessageHandler to notify the UI of future state changes
|
| // from this point on (through onExportNetLogInfoChanged()).
|
| @@ -64,13 +65,6 @@ var NetExportView = (function() {
|
| * the file where NetLog data is collected.
|
| */
|
| onExportNetLogInfoChanged: function(exportNetLogInfo) {
|
| - if (!exportNetLogInfo.useMobileUI) {
|
| - document.getElementById('export-view-send-data').style.display =
|
| - "none";
|
| - document.getElementById('export-view-deletes-log-text').style.display =
|
| - "none";
|
| - }
|
| -
|
| if (exportNetLogInfo.file) {
|
| var message = '';
|
| if (exportNetLogInfo.state == 'LOGGING')
|
| @@ -89,9 +83,12 @@ var NetExportView = (function() {
|
| controls[i].disabled = true;
|
| }
|
|
|
| - $('export-view-deletes-log-text').hidden = true;
|
| - $('export-view-private-data-text').hidden = true;
|
| - $('export-view-send-old-log-text').hidden = true;
|
| + if (this.useMobileUI_()) {
|
| + $('export-view-mobile-deletes-log-text').hidden = true;
|
| + $('export-view-mobile-private-data-text').hidden = true;
|
| + $('export-view-mobile-send-old-log-text').hidden = true;
|
| + }
|
| +
|
| if (exportNetLogInfo.state == 'NOT_LOGGING') {
|
| // Allow making a new log.
|
| $('export-view-strip-private-data-button').disabled = false;
|
| @@ -99,14 +96,15 @@ var NetExportView = (function() {
|
| $('export-view-log-bytes-button').disabled = false;
|
| $('export-view-start-data').disabled = false;
|
|
|
| - // If there's an existing log, allow sending it.
|
| - if (!!exportNetLogInfo.logExists) {
|
| - $('export-view-deletes-log-text').hidden = false;
|
| - $('export-view-send-data').disabled = false;
|
| + // If there's a pre-existing log, allow sending it (this only
|
| + // applies to the mobile UI).
|
| + if (this.useMobileUI_() && exportNetLogInfo.logExists) {
|
| + $('export-view-mobile-deletes-log-text').hidden = false;
|
| + $('export-view-mobile-send-data').disabled = false;
|
| if (!exportNetLogInfo.logCaptureModeKnown) {
|
| - $('export-view-send-old-log-text').hidden = false;
|
| + $('export-view-mobile-send-old-log-text').hidden = false;
|
| } else if (exportNetLogInfo.captureMode != 'STRIP_PRIVATE_DATA') {
|
| - $('export-view-private-data-text').hidden = false;
|
| + $('export-view-mobile-private-data-text').hidden = false;
|
| }
|
| }
|
| } else if (exportNetLogInfo.state == 'LOGGING') {
|
| @@ -121,6 +119,14 @@ var NetExportView = (function() {
|
| $('export-view-file-path-text').textContent =
|
| 'Unable to initialize NetLog data file.';
|
| }
|
| + },
|
| +
|
| + /*
|
| + * Returns true if the UI is being displayed for mobile, otherwise false
|
| + * for desktop. This is controlled by the HTML template.
|
| + */
|
| + useMobileUI_: function() {
|
| + return !!document.getElementById('export-view-mobile-send-data');
|
| }
|
| };
|
|
|
|
|