| Index: components/net_log/resources/net_export.html
|
| diff --git a/components/net_log/resources/net_export.html b/components/net_log/resources/net_export.html
|
| index 48d137250700390ee78859859eb47eb4597d81f9..a887c0c58b942a1e27a260749b2d0876adb7e6ae 100644
|
| --- a/components/net_log/resources/net_export.html
|
| +++ b/components/net_log/resources/net_export.html
|
| @@ -19,87 +19,155 @@
|
| <title>Network Log Export</title>
|
| </head>
|
| <body>
|
| - <h2>Network Log Export</h2>
|
| - <div id="net-export-main">
|
| - <div>
|
| - <button id="export-view-start-data" disabled>
|
| - <span class="export-view-logging-enabled">Start Logging to Disk</span>
|
| - <span class="export-view-logging-disabled">Logging to Disk...</span>
|
| - <if expr="is_ios or is_android">
|
| - <div class="warning" id="export-view-mobile-deletes-log-text" hidden>
|
| - Deletes old log
|
| - </div>
|
| - </if>
|
| - </button>
|
| + <div id="main-container">
|
| + <!--
|
| + =========================================================================
|
| + View for "unitialized" state.
|
| + * Only visible briefly, if at all
|
| + =========================================================================
|
| + -->
|
| + <div id="state-uninitialized">
|
| + <h2>Network Log Export</h2>
|
| + Loading...
|
| </div>
|
| - <div>
|
| - <button id="export-view-stop-data" disabled>Stop Logging</button>
|
| +
|
| + <!--
|
| + =========================================================================
|
| + View for "initial" state.
|
| + * Has controls to start logging.
|
| + =========================================================================
|
| + -->
|
| + <div id="state-initial">
|
| + <h2>Capture Network Log</h2>
|
| + <button id="start-logging">Start Logging to Disk</button>
|
| +
|
| + <div class="section-container">
|
| + Click the button to start logging future network activity to a file on
|
| + disk.
|
| + </div>
|
| +
|
| + <div class="outline-box">
|
| + <b>OPTIONS</b>:
|
| + <span class="warning">This section should normally be left alone.</span>
|
| + <div class="radio-button-div">
|
| + <label>
|
| + <input id="strip-private-data-button" type="radio"
|
| + name="log-mode" value="STRIP_PRIVATE_DATA" checked>
|
| + Strip private information
|
| + </label>
|
| + </div>
|
| + <div class="radio-button-div">
|
| + <label>
|
| + <input id="include-private-data-button" type="radio"
|
| + name="log-mode" value="NORMAL">
|
| + Include cookies and credentials
|
| + </label>
|
| + </div>
|
| + <div class="radio-button-div">
|
| + <label>
|
| + <input id="log-bytes-button" type="radio"
|
| + name="log-mode" value="LOG_BYTES">
|
| + Include raw bytes (will include cookies and credentials)
|
| + </label>
|
| + </div>
|
| + </div>
|
| </div>
|
| - <div>
|
| - <if expr="is_ios or is_android">
|
| - <button id="export-view-mobile-send-data" disabled>
|
| - Email Log
|
| - <div class="warning" id="export-view-mobile-private-data-text" hidden>
|
| - Log contains private information
|
| - </div>
|
| - <div class="warning" id="export-view-mobile-send-old-log-text" hidden>
|
| - Log file from previous session
|
| - </div>
|
| - </button>
|
| - </if>
|
| +
|
| + <!--
|
| + =========================================================================
|
| + View for "logging" state.
|
| + * Shows that logging is in progress
|
| + * Has controls to stop logging
|
| + =========================================================================
|
| + -->
|
| + <div id="state-logging">
|
| + <h2>Saving network events to disk...</h2>
|
| +
|
| + <button id="stop-logging">Stop Logging</button>
|
| +
|
| + <div class="section-container">
|
| + <p>Reproduce the network problem now using another tab. When you are
|
| + done, return to this page and click the Stop button.</p>
|
| +
|
| + <p>All of your browser's networking activity will be written to the log
|
| + file until you either click the Stop button, or close this tab.</p>
|
| + </div>
|
| +
|
| + <div class="outline-box">
|
| + <b>FILE:</b> <span id='file-path-logging'></span> <br/>
|
| + <b>OPTIONS:</b> <span id="capture-mode-logging"></span>
|
| + </div>
|
| </div>
|
| - <p>
|
| - <b>INSTRUCTIONS</b>: Start logging, reproduce the problem,
|
| - and then stop logging.
|
| -
|
| +
|
| + <!--
|
| + =========================================================================
|
| + View for "stopped" state.
|
| + * Shows where the log file was saved to
|
| + * Has controls to email the log (mobile)
|
| + =========================================================================
|
| + -->
|
| + <div id="state-stopped">
|
| + <h2>Log file written</h2>
|
| +
|
| <if expr="is_ios or is_android">
|
| - Once logging has stopped, click the "Email Log" button to save the
|
| - file. Starting a new log will overwrite the old one.
|
| - </if>
|
| + <button id="mobile-email">
|
| + Email Log
|
| + <div class="warning" id="mobile-private-data-text" hidden>
|
| + Log contains private information
|
| + </div>
|
|
|
| - <if expr="not(is_ios or is_android)">
|
| - Once logging has stopped, attach the log file to the bug report.
|
| + <div class="warning" id="mobile-send-old-log-text" hidden>
|
| + Log file from previous session
|
| + </div>
|
| + </button>
|
| </if>
|
| - </p>
|
| - <p>
|
| - <!-- TODO(rayraymond): Change link to that of new standalone webapp.
|
| - See http://crbug.com/472699 -->
|
| - Log files can be loaded using
|
| - <a href="chrome://net-internals#import" target="_blank">net-internals</a>.
|
| - </p>
|
| - <p>
|
| - <b><span class="warning">WARNING</span></b>: Logs contain a list of sites
|
| - visited from when logging started to when logging stopped. They may also
|
| - contain general network configuration information, such as DNS and proxy
|
| - configuration. If private information is not stripped, the logs also
|
| - contain cookies and credentials.
|
| - </p>
|
| - <p>
|
| - <b>ADVANCED</b>:
|
| - <span class="warning">This section should normally be left alone.</span>
|
| - <div class="radio-button-div">
|
| - <label>
|
| - <input id="export-view-strip-private-data-button" type="radio"
|
| - name="log-mode" value="STRIP_PRIVATE_DATA" checked disabled>
|
| - Strip private information
|
| - </label>
|
| +
|
| + <button id="startover">
|
| + Start Over
|
| + </button>
|
| +
|
| + <div class="section-container">
|
| + <if expr="is_ios or is_android">
|
| + Share the log by emailing it, and you are done!
|
| + </if>
|
| +
|
| + <if expr="not(is_ios or is_android)">
|
| + Attach the log file to your bug report, and you are done!
|
| + </if>
|
| + </div>
|
| +
|
| + <div class="outline-box">
|
| + <b>FILE:</b> <span id='file-path-stopped'></span> <br/>
|
| + <b>OPTIONS:</b> <span id="capture-mode-stopped"></span>
|
| </div>
|
| - <div class="radio-button-div">
|
| - <label>
|
| - <input id="export-view-include-private-data-button" type="radio"
|
| - name="log-mode" value="NORMAL" disabled>
|
| - Include cookies and credentials
|
| - </label>
|
| +
|
| + <div class="section-container">
|
| + <!-- TODO(rayraymond): Change link to that of new standalone webapp.
|
| + See http://crbug.com/472699 -->
|
| + The log file can also be loaded using
|
| + <a href="chrome://net-internals#import"
|
| + target="_blank">net-internals</a>.
|
| </div>
|
| - <div class="radio-button-div">
|
| - <label>
|
| - <input id="export-view-log-bytes-button" type="radio"
|
| - name="log-mode" value="LOG_BYTES" disabled>
|
| - Include raw bytes (will include cookies and credentials)
|
| - </label>
|
| +
|
| + <div class="section-container">
|
| + <b><span class="warning">PRIVACY</span></b>: Be aware when
|
| + sharing your network logs that they may contain private information. At
|
| + a minimum, they list the URLs and hostnames of sites visited while
|
| + logging was enabled.
|
| + <a href="#" id="privacy-read-more-link">Read more...</a>
|
| +
|
| + <div id="privacy-read-more">
|
| + <ul>
|
| + <li>There may be some cached hostnames/URLs from sites visited prior
|
| + to enabling logging.</li>
|
| + <li>Logs may contain information about your networking environment,
|
| + such as the proxy configuration used.</li>
|
| + <li>The default logging options do a <i>best-effort</i> stripping of
|
| + any cookies/credentials in the logged requests.</li>
|
| + </ul>
|
| + </div>
|
| </div>
|
| - </p>
|
| + </div>
|
| </div>
|
| - <pre id="export-view-file-path-text"></pre>
|
| </body>
|
| </html>
|
|
|