summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshinfan@chromium.org <shinfan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-17 01:28:06 +0000
committershinfan@chromium.org <shinfan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-17 01:28:06 +0000
commitfde7cd9129dca794d697937c6bf49505374cf4fd (patch)
tree3b5455bfd3ff110f83a621e63af73cabc781b962
parent03e57bbe1ad9d520c9bf0c72ff55b9045d4570c8 (diff)
downloadchromium_src-fde7cd9129dca794d697937c6bf49505374cf4fd.zip
chromium_src-fde7cd9129dca794d697937c6bf49505374cf4fd.tar.gz
chromium_src-fde7cd9129dca794d697937c6bf49505374cf4fd.tar.bz2
Rename Log Analyzer to Log Visualizer
BUG=273227 TEST=manual Review URL: https://chromiumcodereview.appspot.com/23171007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218138 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/net_internals/cros_log_marker.js29
-rw-r--r--chrome/browser/resources/net_internals/cros_log_visualizer.js24
-rw-r--r--chrome/browser/resources/net_internals/cros_log_visualizer_view.css (renamed from chrome/browser/resources/net_internals/cros_log_analyzer_view.css)72
-rw-r--r--chrome/browser/resources/net_internals/cros_log_visualizer_view.html56
-rw-r--r--chrome/browser/resources/net_internals/cros_log_visualizer_view.js (renamed from chrome/browser/resources/net_internals/cros_log_analyzer_view.js)83
-rw-r--r--chrome/browser/resources/net_internals/index.html4
-rw-r--r--chrome/browser/resources/net_internals/index.js2
-rw-r--r--chrome/browser/resources/net_internals/main.js5
-rw-r--r--chrome/test/data/webui/net_internals/log_util.js4
-rw-r--r--chrome/test/data/webui/net_internals/main.js2
-rw-r--r--chrome/test/data/webui/net_internals/net_internals_test.js2
11 files changed, 172 insertions, 111 deletions
diff --git a/chrome/browser/resources/net_internals/cros_log_marker.js b/chrome/browser/resources/net_internals/cros_log_marker.js
index 71201e3..d67a00c 100644
--- a/chrome/browser/resources/net_internals/cros_log_marker.js
+++ b/chrome/browser/resources/net_internals/cros_log_marker.js
@@ -14,12 +14,13 @@
var CrosLogMarker = (function() {
'use strict';
- // Special classes (defined in log_analyzer_view.css)
- var LOG_MARKER_HIGHLIGHT_CLASS = 'cros-log-analyzer-marker-highlight';
- var LOG_MARKER_CONTAINER_ID = 'cros-log-analyzer-marker-container';
- var LOG_MARKER_HISTORY_ENTRY_CLASS = 'cros-log-analyzer-marker-history-entry';
+ // Special classes (defined in log_visualizer_view.css)
+ var LOG_MARKER_HIGHLIGHT_CLASS = 'cros-log-visualizer-marker-highlight';
+ var LOG_MARKER_CONTAINER_ID = 'cros-log-visualizer-marker-container';
+ var LOG_MARKER_HISTORY_ENTRY_CLASS =
+ 'cros-log-visualizer-marker-history-entry';
var LOG_MARKER_HISTORY_COLOR_TAG_CLASS =
- 'cros-log-analyzer-marker-history-color-tag';
+ 'cros-log-visualizer-marker-history-color-tag';
/**
* Colors used for highlighting. (Current we support 6 colors)
@@ -56,18 +57,18 @@ var CrosLogMarker = (function() {
/**
* @constructor
- * @param {CrosLogAnalyzerView} logAnalyzerView A reference to
- * CrosLogAnalyzerView.
+ * @param {CrosLogVisualizerView} logVisualizerView A reference to
+ * CrosLogVisualizerView.
*/
- function CrosLogMarker(logAnalyzerView) {
+ function CrosLogMarker(logVisualizerView) {
this.container = $(LOG_MARKER_CONTAINER_ID);
// Stores highlight objects for each entry.
this.entryHighlights = [];
// Stores all the filter queries.
this.markHistory = {};
- // Object references from CrosLogAnalyzerView.
- this.logEntries = logAnalyzerView.logEntries;
- this.logAnalyzerView = logAnalyzerView;
+ // Object references from CrosLogVisualizerView.
+ this.logEntries = logVisualizerView.logEntries;
+ this.logVisualizerView = logVisualizerView;
// Counts how many highlights are created.
this.markCount = 0;
for (var i = 0; i < this.logEntries.length; i++) {
@@ -324,11 +325,11 @@ var CrosLogMarker = (function() {
},
/**
- * Refresh the log table in the CrosLogAnalyzerView.
+ * Refresh the log table in the CrosLogVisualizerView.
*/
refreshLogTable: function() {
- this.logAnalyzerView.populateTable();
- this.logAnalyzerView.filterLog();
+ this.logVisualizerView.populateTable();
+ this.logVisualizerView.filterLog();
},
/**
diff --git a/chrome/browser/resources/net_internals/cros_log_visualizer.js b/chrome/browser/resources/net_internals/cros_log_visualizer.js
index 40b5475..73db4c3 100644
--- a/chrome/browser/resources/net_internals/cros_log_visualizer.js
+++ b/chrome/browser/resources/net_internals/cros_log_visualizer.js
@@ -14,18 +14,18 @@ var CrosLogVisualizer = (function() {
'use strict';
// HTML attributes of canvas
- var LOG_VISUALIZER_CANVAS_CLASS = 'cros-log-analyzer-visualizer-canvas';
+ var LOG_VISUALIZER_CANVAS_CLASS = 'cros-log-visualizer-visualizer-canvas';
var LOG_VISUALIZER_CANVAS_WIDTH = 980;
var LOG_VISUALIZER_CANVAS_HEIGHT = 100;
// Special HTML classes
- var LOG_VISUALIZER_TIMELINE_ID = 'cros-log-analyzer-visualizer-timeline';
+ var LOG_VISUALIZER_TIMELINE_ID = 'cros-log-visualizer-visualizer-timeline';
var LOG_VISUALIZER_TIME_DISPLAY_CLASS =
- 'cros-log-analyzer-visualizer-time-display';
+ 'cros-log-visualizer-visualizer-time-display';
var LOG_VISUALIZER_RESET_BTN_ID =
- 'cros-log-analyzer-visualizer-reset-btn';
+ 'cros-log-visualizer-visualizer-reset-btn';
var LOG_VISUALIZER_TRACKING_LAYER_ID =
- 'cros-log-analyzer-visualizer-tracking-layer';
+ 'cros-log-visualizer-visualizer-tracking-layer';
/**
* Event level list
@@ -51,12 +51,12 @@ var CrosLogVisualizer = (function() {
/**
* @constructor
*/
- function CrosLogVisualizer(logAnalyzer, containerID) {
+ function CrosLogVisualizer(logVisualizer, containerID) {
/**
- * Pass the LogAnalyzer in as a reference so the visualizer can
+ * Pass the LogVisualizer in as a reference so the visualizer can
* synchrous with the log filter.
*/
- this.logAnalyzer = logAnalyzer;
+ this.logVisualizer = logVisualizer;
// If the data is initialized
this.dataIntialized = false;
@@ -84,7 +84,7 @@ var CrosLogVisualizer = (function() {
this.container.appendChild(this.btnReset);
this.container.addEventListener('webkitAnimationEnd', function() {
- this.container.classList.remove('cros-log-analyzer-flash');
+ this.container.classList.remove('cros-log-visualizer-flash');
}.bind(this), false);
}
@@ -193,7 +193,7 @@ var CrosLogVisualizer = (function() {
* CSS3 fadeIn/fadeOut effects
*/
flashEffect: function() {
- this.container.classList.add('cros-log-analyzer-flash');
+ this.container.classList.add('cros-log-visualizer-flash');
},
/**
@@ -205,7 +205,7 @@ var CrosLogVisualizer = (function() {
// Reset all the parameters as initial
this.initialize();
// Reset the visibility of the entries in the log table
- this.logAnalyzer.filterLog();
+ this.logVisualizer.filterLog();
this.flashEffect();
},
@@ -368,7 +368,7 @@ var CrosLogVisualizer = (function() {
// Recalculate the pamameter based on the range user select
this.reCalculate();
// Filter the log table and hide the entries that are not in the range
- this.logAnalyzer.filterLog();
+ this.logVisualizer.filterLog();
},
};
diff --git a/chrome/browser/resources/net_internals/cros_log_analyzer_view.css b/chrome/browser/resources/net_internals/cros_log_visualizer_view.css
index ba3392b..8f49da3 100644
--- a/chrome/browser/resources/net_internals/cros_log_analyzer_view.css
+++ b/chrome/browser/resources/net_internals/cros_log_visualizer_view.css
@@ -3,16 +3,16 @@
* found in the LICENSE file.
*/
- #cros-log-analyzer-header {
+ #cros-log-visualizer-header {
margin-bottom: 20px;
}
-.cros-log-analyzer-container {
+.cros-log-visualizer-container {
background-color: rgb(242, 242, 242);
border: 1px solid rgb(220, 220, 220);
}
-#cros-log-analyzer-log-content {
+#cros-log-visualizer-log-content {
border: 1px solid rgb(220, 220, 220);
font-size: 11px;
height: 300px;
@@ -23,33 +23,33 @@
width: 1000px;
}
-#cros-log-analyzer-filter-container {
+#cros-log-visualizer-filter-container {
font-size: 12px;
margin-bottom: 5px;
padding: 5px 10px;
width: 1000px;
}
-#cros-log-analyzer-filter-container p {
+#cros-log-visualizer-filter-container p {
margin: 10px 0;
}
-#cros-log-analyzer-log-table {
+#cros-log-visualizer-log-table {
table-layout: fixed;
width: 950px;
}
-#cros-log-analyzer-log-table td {
+#cros-log-visualizer-log-table td {
overflow: hidden;
table-layout: fixed;
word-wrap: break-word;
}
-.cros-log-analyzer-td-time {
+.cros-log-visualizer-td-time {
width: 100px;
}
-#cros-log-analyzer-log-header-table {
+#cros-log-visualizer-log-header-table {
font-size: 12px;
font-weight: bold;
margin-bottom: -1px;
@@ -57,16 +57,16 @@
width: 1000px;
}
-.cros-log-analyzer-td-pname {
+.cros-log-visualizer-td-pname {
text-align: center;
width: 120px;
}
-.cros-log-analyzer-td-level {
+.cros-log-visualizer-td-level {
width: 70px;
}
-.cros-log-analyzer-td-level p {
+.cros-log-visualizer-td-level p {
border: 1px solid;
border-radius: 5px;
margin: 0 3px;
@@ -74,40 +74,40 @@
width: 58px;
}
-.cros-log-analyzer-td-level-error {
+.cros-log-visualizer-td-level-error {
background-color: rgb(255, 153, 163);
color: rgb(238, 0, 0);
}
-.cros-log-analyzer-td-level-info {
+.cros-log-visualizer-td-level-info {
background-color: rgb(195, 227, 250);
color: rgb(10, 147, 245);
width: 120px;
}
-.cros-log-analyzer-td-level-warning {
+.cros-log-visualizer-td-level-warning {
background-color: rgb(250, 229, 195);
color: darkorange;
}
-.cros-log-analyzer-td-level-unknown {
+.cros-log-visualizer-td-level-unknown {
color: gray;
}
-.cros-log-analyzer-td-pid {
+.cros-log-visualizer-td-pid {
width: 60px;
}
-#cros-log-analyzer-filter-pname {
+#cros-log-visualizer-filter-pname {
border-bottom: 1px solid rgb(209, 209, 209);
padding: 5px 0 10px 0;
}
-#cros-log-analyzer-filter-level {
+#cros-log-visualizer-filter-level {
padding: 5px 0 10px 0;
}
-#cros-log-analyzer-search-container {
+#cros-log-visualizer-search-container {
-webkit-margin-start: 760px;
border-radius: 5px;
font-size: 12px;
@@ -118,18 +118,18 @@
width: 280px;
}
-#cros-log-analyzer-search-container input {
+#cros-log-visualizer-search-container input {
border: 1px solid rgb(220, 220, 220);
}
-#cros-log-analyzer-visualizer-container {
+#cros-log-visualizer-visualizer-container {
border: 1px solid rgb(211, 211, 211);
height: 100px;
position: relative;
width: 1002px;
}
-#cros-log-analyzer-visualizer-timeline {
+#cros-log-visualizer-visualizer-timeline {
background: gray;
opacity: 0.5;
position: absolute;
@@ -137,13 +137,13 @@
width: 2px;
}
-.cros-log-analyzer-visualizer-time-display {
+.cros-log-visualizer-visualizer-time-display {
font-size: 10px;
position: absolute;
width: 50px;
}
-#cros-log-analyzer-visualizer-reset-btn {
+#cros-log-visualizer-visualizer-reset-btn {
border: 1px solid rgb(211, 211, 211);
border-radius: 2px;
position: absolute;
@@ -151,7 +151,7 @@
top: 5px;
}
-#cros-log-analyzer-visualizer-tracking-layer {
+#cros-log-visualizer-visualizer-tracking-layer {
background: none;
height: 100%;
left: 0;
@@ -160,17 +160,17 @@
width: 100%;
}
-.cros-log-analyzer-visualizer-canvas {
+.cros-log-visualizer-visualizer-canvas {
left: 0;
position: absolute;
top: 0;
}
-.cros-log-analyzer-flash {
+.cros-log-visualizer-flash {
-webkit-animation: fade 1s linear 1;
}
-#cros-log-analyzer-marker-container {
+#cros-log-visualizer-marker-container {
background-color: rgb(242, 242, 242);
border: 1px solid rgb(211, 211, 211);
left: 1030px;
@@ -181,40 +181,40 @@
width: 200px;
}
-.cros-log-analyzer-marker-history-entry {
+.cros-log-visualizer-marker-history-entry {
display: -webkit-flex;
height: 20px;
}
-.cros-log-analyzer-marker-history-entry * {
+.cros-log-visualizer-marker-history-entry * {
display: block;
}
-.cros-log-analyzer-marker-history-entry p {
+.cros-log-visualizer-marker-history-entry p {
font-size: 13px;
height: 15px;
margin: 0;
width: 98px;
}
-.cros-log-analyzer-marker-history-entry a {
+.cros-log-visualizer-marker-history-entry a {
color: grey;
font-size: 11px;
}
-.cros-log-analyzer-marker-history-color-tag {
+.cros-log-visualizer-marker-history-color-tag {
border-radius: 10px;
height: 10px;
margin: 4px;
width: 10px;
}
-.cros-log-analyzer-marker-highlight {
+.cros-log-visualizer-marker-highlight {
font-weight: bold;
}
-#cros-log-analyzer-save-btn {
+#cros-log-visualizer-save-btn {
background-color: rgb(211, 211, 211);
}
diff --git a/chrome/browser/resources/net_internals/cros_log_visualizer_view.html b/chrome/browser/resources/net_internals/cros_log_visualizer_view.html
new file mode 100644
index 0000000..0803884
--- /dev/null
+++ b/chrome/browser/resources/net_internals/cros_log_visualizer_view.html
@@ -0,0 +1,56 @@
+<!-- Log Visualizer -->
+<div id="cros-log-visualizer-tab-content" class="content-box">
+ <div id="cros-log-visualizer-header">
+ Network Log
+ </div>
+ <div id='cros-log-visualizer-search-container'
+ class='cros-log-visualizer-container'>
+ Search:
+ <input type='text' placeholder="Enter your keyword"
+ id='cros-log-visualizer-search-input'>
+ <span id='cros-log-visualizer-save-btn'>Save</span>
+ </div>
+ <table id="cros-log-visualizer-log-header-table"
+ class="cros-log-visualizer-container">
+ <tr>
+ <td class="cros-log-visualizer-td-level">Level</td>
+ <td class="cros-log-visualizer-td-time">Time</td>
+ <td class="cros-log-visualizer-td-pname">Process</td>
+ <td class="cros-log-visualizer-td-pid">PID</td>
+ <td class="cros-log-visualizer-td-description">Description</td>
+ </tr>
+ </table>
+ <div id="cros-log-visualizer-log-content">
+ <table id="cros-log-visualizer-log-table">
+ </table>
+ </div>
+ <div id='cros-log-visualizer-marker-container'>
+ </div>
+ <div id='cros-log-visualizer-filter-container'
+ class='cros-log-visualizer-container'>
+ <div id='cros-log-visualizer-filter-pname'>
+ </div>
+ <div id='cros-log-visualizer-filter-level'>
+ Level:
+ <span class="cros-log-visualizer-filter-level-block">
+ <input type='checkbox' id='checkbox-error' checked=true>
+ <label for="checkbox-error">Error</label>
+ </span>
+ <span class="cros-log-visualizer-filter-level-block">
+ <input type='checkbox' id='checkbox-warning' checked=true>
+ <label for="checkbox-warning">Warning</label>
+ </span>
+ <span class="cros-log-visualizer-filter-level-block">
+ <input type='checkbox' id='checkbox-info' checked=true>
+ <label for="checkbox-info">Info</label>
+ </span>
+ <span class="cros-log-visualizer-filter-level-block">
+ <input type='checkbox' id='checkbox-unknown'checked=true>
+ <label for="checkbox-unknown">Unknown</label>
+ </span>
+ </div>
+ </div>
+ <div id="cros-log-visualizer-visualizer-container">
+ <div id="cros-log-visualizer-visualizer-tracking-layer"></div>
+ </div>
+</div>
diff --git a/chrome/browser/resources/net_internals/cros_log_analyzer_view.js b/chrome/browser/resources/net_internals/cros_log_visualizer_view.js
index fa6927a..6a0bf48 100644
--- a/chrome/browser/resources/net_internals/cros_log_analyzer_view.js
+++ b/chrome/browser/resources/net_internals/cros_log_visualizer_view.js
@@ -4,43 +4,44 @@
/**
* This view displays the log messages from various resources in an
- * interactive log analyzer
+ * interactive log visualizer
*
* - Filter checkboxes
* - Filter text inputs
* - Display the log by different sections: time|level|process|description
*
*/
-var CrosLogAnalyzerView = (function() {
+var CrosLogVisualizerView = (function() {
'use strict';
// Inherits from DivView.
var superClass = DivView;
- // Special classes (defined in log_analyzer_view.css)
- var LOG_CONTAINER_CLASSNAME = 'cros-log-analyzer-container';
- var LOG_FILTER_PNAME_BLOCK_CLASSNAME = 'cros-log-analyzer-filter-pname-block';
- var LOG_CELL_HEADER_CLASSNAME = 'cros-log-analyzer-td-head';
- var LOG_CELL_TIME_CLASSNAME = 'cros-log-analyzer-td-time';
- var LOG_CELL_PNAME_CLASSNAME = 'cros-log-analyzer-td-pname';
- var LOG_CELL_PID_CLASSNAME = 'cros-log-analyzer-td-pid';
- var LOG_CELL_DESCRIPTION_CLASSNAME = 'cros-log-analyzer-td-description';
- var LOG_CELL_LEVEL_CLASSNAME = 'cros-log-analyzer-td-level';
+ // Special classes (defined in log_visualizer_view.css)
+ var LOG_CONTAINER_CLASSNAME = 'cros-log-visualizer-container';
+ var LOG_FILTER_PNAME_BLOCK_CLASSNAME =
+ 'cros-log-visualizer-filter-pname-block';
+ var LOG_CELL_HEADER_CLASSNAME = 'cros-log-visualizer-td-head';
+ var LOG_CELL_TIME_CLASSNAME = 'cros-log-visualizer-td-time';
+ var LOG_CELL_PNAME_CLASSNAME = 'cros-log-visualizer-td-pname';
+ var LOG_CELL_PID_CLASSNAME = 'cros-log-visualizer-td-pid';
+ var LOG_CELL_DESCRIPTION_CLASSNAME = 'cros-log-visualizer-td-description';
+ var LOG_CELL_LEVEL_CLASSNAME = 'cros-log-visualizer-td-level';
var LOG_CELL_LEVEL_CLASSNAME_LIST = {
- 'Error': 'cros-log-analyzer-td-level-error',
- 'Warning': 'cros-log-analyzer-td-level-warning',
- 'Info': 'cros-log-analyzer-td-level-info',
- 'Unknown': 'cros-log-analyzer-td-level-unknown'
+ 'Error': 'cros-log-visualizer-td-level-error',
+ 'Warning': 'cros-log-visualizer-td-level-warning',
+ 'Info': 'cros-log-visualizer-td-level-info',
+ 'Unknown': 'cros-log-visualizer-td-level-unknown'
};
/**
* @constructor
*/
- function CrosLogAnalyzerView() {
- assertFirstConstructorCall(CrosLogAnalyzerView);
+ function CrosLogVisualizerView() {
+ assertFirstConstructorCall(CrosLogVisualizerView);
// Call superclass's constructor.
- superClass.call(this, CrosLogAnalyzerView.MAIN_BOX_ID);
+ superClass.call(this, CrosLogVisualizerView.MAIN_BOX_ID);
// Stores log entry objects
this.logEntries = [];
@@ -50,7 +51,7 @@ var CrosLogAnalyzerView = (function() {
this.logData = '';
// Stores all the unique process names
this.pNames = [];
- // References to special HTML elements in log_analyzer_view.html
+ // References to special HTML elements in log_visualizer_view.html
this.pNameCheckboxes = {};
this.levelCheckboxes = {};
this.tableEntries = [];
@@ -58,20 +59,22 @@ var CrosLogAnalyzerView = (function() {
this.initialize();
}
- CrosLogAnalyzerView.TAB_ID = 'tab-handle-cros-log-analyzer';
- CrosLogAnalyzerView.TAB_NAME = 'Log Analyzer';
- CrosLogAnalyzerView.TAB_HASH = '#analyzer';
+ CrosLogVisualizerView.TAB_ID = 'tab-handle-cros-log-visualizer';
+ CrosLogVisualizerView.TAB_NAME = 'Log Visualizer';
+ CrosLogVisualizerView.TAB_HASH = '#visualizer';
- // IDs for special HTML elements in log_analyzer_view.html
- CrosLogAnalyzerView.MAIN_BOX_ID = 'cros-log-analyzer-tab-content';
- CrosLogAnalyzerView.LOG_TABLE_ID = 'cros-log-analyzer-log-table';
- CrosLogAnalyzerView.LOG_FILTER_PNAME_ID = 'cros-log-analyzer-filter-pname';
- CrosLogAnalyzerView.LOG_SEARCH_INPUT_ID = 'cros-log-analyzer-search-input';
- CrosLogAnalyzerView.LOG_SEARCH_SAVE_BTN_ID = 'cros-log-analyzer-save-btn';
- CrosLogAnalyzerView.LOG_VISUALIZER_CONTAINER_ID =
- 'cros-log-analyzer-visualizer-container';
+ // IDs for special HTML elements in log_visualizer_view.html
+ CrosLogVisualizerView.MAIN_BOX_ID = 'cros-log-visualizer-tab-content';
+ CrosLogVisualizerView.LOG_TABLE_ID = 'cros-log-visualizer-log-table';
+ CrosLogVisualizerView.LOG_FILTER_PNAME_ID =
+ 'cros-log-visualizer-filter-pname';
+ CrosLogVisualizerView.LOG_SEARCH_INPUT_ID =
+ 'cros-log-visualizer-search-input';
+ CrosLogVisualizerView.LOG_SEARCH_SAVE_BTN_ID = 'cros-log-visualizer-save-btn';
+ CrosLogVisualizerView.LOG_VISUALIZER_CONTAINER_ID =
+ 'cros-log-visualizer-visualizer-container';
- cr.addSingletonGetter(CrosLogAnalyzerView);
+ cr.addSingletonGetter(CrosLogVisualizerView);
/**
* Contains types of logs we are interested in
@@ -86,7 +89,7 @@ var CrosLogAnalyzerView = (function() {
*/
var TABLE_HEADERS_LIST = ['Level', 'Time', 'Process', 'PID', 'Description'];
- CrosLogAnalyzerView.prototype = {
+ CrosLogVisualizerView.prototype = {
// Inherit the superclass's methods.
__proto__: superClass.prototype,
@@ -96,9 +99,9 @@ var CrosLogAnalyzerView = (function() {
*/
initialize: function() {
g_browser.addSystemLogObserver(this);
- $(CrosLogAnalyzerView.LOG_SEARCH_INPUT_ID).addEventListener('keyup',
+ $(CrosLogVisualizerView.LOG_SEARCH_INPUT_ID).addEventListener('keyup',
this.onSearchQueryChange_.bind(this));
- $(CrosLogAnalyzerView.LOG_SEARCH_SAVE_BTN_ID).addEventListener(
+ $(CrosLogVisualizerView.LOG_SEARCH_SAVE_BTN_ID).addEventListener(
'click', this.onSaveBtnClicked_.bind(this));
},
@@ -109,7 +112,7 @@ var CrosLogAnalyzerView = (function() {
onSaveBtnClicked_: function() {
this.marker.addMarkHistory(this.currentQuery);
// Clears the filter query
- $(CrosLogAnalyzerView.LOG_SEARCH_INPUT_ID).value = '';
+ $(CrosLogVisualizerView.LOG_SEARCH_INPUT_ID).value = '';
this.currentQuery = '';
// Refresh the table
this.populateTable();
@@ -117,7 +120,7 @@ var CrosLogAnalyzerView = (function() {
},
onSearchQueryChange_: function() {
- var inputField = $(CrosLogAnalyzerView.LOG_SEARCH_INPUT_ID);
+ var inputField = $(CrosLogVisualizerView.LOG_SEARCH_INPUT_ID);
this.currentQuery = inputField.value;
this.filterLog();
},
@@ -128,7 +131,7 @@ var CrosLogAnalyzerView = (function() {
* level.
*/
populateTable: function() {
- var logTable = $(CrosLogAnalyzerView.LOG_TABLE_ID);
+ var logTable = $(CrosLogVisualizerView.LOG_TABLE_ID);
logTable.innerHTML = '';
this.tableEntries.length = 0;
// Create entries
@@ -261,7 +264,7 @@ var CrosLogAnalyzerView = (function() {
* process filters.
*/
createFilterByPName: function() {
- var filterContainerDiv = $(CrosLogAnalyzerView.LOG_FILTER_PNAME_ID);
+ var filterContainerDiv = $(CrosLogVisualizerView.LOG_FILTER_PNAME_ID);
filterContainerDiv.innerHTML = 'Process: ';
for (var i = 0; i < this.pNames.length; i++) {
var pNameBlock = this.createPNameBlock(this.pNames[i]);
@@ -310,7 +313,7 @@ var CrosLogAnalyzerView = (function() {
*/
createVisualizer: function() {
this.visualizer = new CrosLogVisualizer(this,
- CrosLogAnalyzerView.LOG_VISUALIZER_CONTAINER_ID);
+ CrosLogVisualizerView.LOG_VISUALIZER_CONTAINER_ID);
this.visualizer.updateEvents(this.logEntries);
},
@@ -367,5 +370,5 @@ var CrosLogAnalyzerView = (function() {
}
};
- return CrosLogAnalyzerView;
+ return CrosLogVisualizerView;
})();
diff --git a/chrome/browser/resources/net_internals/index.html b/chrome/browser/resources/net_internals/index.html
index a62ff75..02eeb7a 100644
--- a/chrome/browser/resources/net_internals/index.html
+++ b/chrome/browser/resources/net_internals/index.html
@@ -16,7 +16,7 @@ found in the LICENSE file.
<link rel="stylesheet" href="timeline_view.css">
<link rel="stylesheet" href="logs_view.css">
<link rel="stylesheet" href="chromeos_view.css">
- <link rel="stylesheet" href="cros_log_analyzer_view.css">
+ <link rel="stylesheet" href="cros_log_visualizer_view.css">
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://net-internals/index.js"></script>
@@ -46,7 +46,7 @@ found in the LICENSE file.
<include src="timeline_view.html"/>
<include src="logs_view.html"/>
<include src="chromeos_view.html"/>
- <include src="cros_log_analyzer_view.html"/>
+ <include src="cros_log_visualizer_view.html"/>
</div>
<script src="chrome://resources/js/i18n_template.js"></script>
diff --git a/chrome/browser/resources/net_internals/index.js b/chrome/browser/resources/net_internals/index.js
index 49b1c8a..59b892f3 100644
--- a/chrome/browser/resources/net_internals/index.js
+++ b/chrome/browser/resources/net_internals/index.js
@@ -50,7 +50,7 @@
<include src="chromeos_view.js"/>
<include src="http_pipeline_view.js"/>
<include src="bandwidth_view.js"/>
-<include src="cros_log_analyzer_view.js"/>
+<include src="cros_log_visualizer_view.js"/>
<include src="cros_log_entry.js"/>
<include src="cros_log_visualizer.js" />
<include src="cros_log_marker.js" />
diff --git a/chrome/browser/resources/net_internals/main.js b/chrome/browser/resources/net_internals/main.js
index 50927d1..9f97e1b 100644
--- a/chrome/browser/resources/net_internals/main.js
+++ b/chrome/browser/resources/net_internals/main.js
@@ -195,7 +195,7 @@ var MainView = (function() {
addTab(HttpCacheView);
addTab(ModulesView);
addTab(TestView);
- addTab(CrosLogAnalyzerView);
+ addTab(CrosLogVisualizerView);
addTab(HSTSView);
addTab(LogsView);
addTab(BandwidthView);
@@ -204,7 +204,8 @@ var MainView = (function() {
this.tabSwitcher_.showMenuItem(LogsView.TAB_ID, cr.isChromeOS);
this.tabSwitcher_.showMenuItem(CrosView.TAB_ID, cr.isChromeOS);
- this.tabSwitcher_.showMenuItem(CrosLogAnalyzerView.TAB_ID, cr.isChromeOS);
+ this.tabSwitcher_.showMenuItem(CrosLogVisualizerView.TAB_ID,
+ cr.isChromeOS);
},
/**
diff --git a/chrome/test/data/webui/net_internals/log_util.js b/chrome/test/data/webui/net_internals/log_util.js
index b499b77..d9e8aa3 100644
--- a/chrome/test/data/webui/net_internals/log_util.js
+++ b/chrome/test/data/webui/net_internals/log_util.js
@@ -176,7 +176,7 @@ function checkViewsAfterLogLoaded() {
prerender: true,
bandwidth: false,
chromeos: false,
- analyzer: false
+ visualizer: false
};
NetInternalsTest.checkTabHandleVisibility(tabVisibilityState, false);
}
@@ -208,7 +208,7 @@ function checkViewsAfterNetLogLoggerLogLoaded() {
prerender: false,
bandwidth: false,
chromeos: false,
- analyzer: false
+ visualizer: false
};
NetInternalsTest.checkTabHandleVisibility(tabVisibilityState, false);
}
diff --git a/chrome/test/data/webui/net_internals/main.js b/chrome/test/data/webui/net_internals/main.js
index c45340f..7d9a4cc 100644
--- a/chrome/test/data/webui/net_internals/main.js
+++ b/chrome/test/data/webui/net_internals/main.js
@@ -41,7 +41,7 @@ TEST_F('NetInternalsTest', 'netInternalsTourTabs', function() {
prerender: true,
bandwidth: true,
chromeos: cr.isChromeOS,
- analyzer: cr.isChromeOS
+ visualizer: cr.isChromeOS
};
NetInternalsTest.checkTabHandleVisibility(tabVisibilityState, true);
diff --git a/chrome/test/data/webui/net_internals/net_internals_test.js b/chrome/test/data/webui/net_internals/net_internals_test.js
index b107e30..500063b 100644
--- a/chrome/test/data/webui/net_internals/net_internals_test.js
+++ b/chrome/test/data/webui/net_internals/net_internals_test.js
@@ -298,7 +298,7 @@ var NetInternalsTest = (function() {
prerender: PrerenderView.TAB_ID,
bandwidth: BandwidthView.TAB_ID,
chromeos: CrosView.TAB_ID,
- analyzer: CrosLogAnalyzerView.TAB_ID
+ visualizer: CrosLogVisualizerView.TAB_ID
};
assertEquals(typeof hashToTabHandleIdMap[hash], 'string',