Index: chrome/browser/resources/net_internals/main.js |
diff --git a/chrome/browser/resources/net_internals/main.js b/chrome/browser/resources/net_internals/main.js |
index 20cbd10f03a775c839f2b4357724e14ee3ae3c5c..27e49284b52d28adb8cc1281f68e0c41341a4052 100644 |
--- a/chrome/browser/resources/net_internals/main.js |
+++ b/chrome/browser/resources/net_internals/main.js |
@@ -7,11 +7,11 @@ |
* updated on load log). The *Types dictionaries map strings to numeric IDs, |
* while the *TypeNames are the other way around. |
*/ |
-var LogEventType = null; |
-var LogEventTypeNames = null; |
-var LogEventPhase = null; |
-var LogSourceType = null; |
-var LogSourceTypeNames = null; |
+var EventType = null; |
+var EventTypeNames = null; |
+var EventPhase = null; |
+var EventSourceType = null; |
+var EventSourceTypeNames = null; |
var LogLevelType = null; |
var ClientInfo = null; |
var NetError = null; |
@@ -244,11 +244,11 @@ ConstantsObserver.prototype.onReceivedConstants = function(receivedConstants) { |
Constants = receivedConstants; |
- LogEventType = Constants.logEventTypes; |
- LogEventTypeNames = makeInverseMap(LogEventType); |
- LogEventPhase = Constants.logEventPhase; |
- LogSourceType = Constants.logSourceType; |
- LogSourceTypeNames = makeInverseMap(LogSourceType); |
+ EventType = Constants.eventType; |
+ EventTypeNames = makeInverseMap(EventType); |
+ EventPhase = Constants.eventPhase; |
+ EventSourceType = Constants.sourceType; |
mmenke
2012/06/08 00:12:51
This breaks log loading compatibility.
eroman
2012/06/08 00:13:29
Good point. Let me rework that!
|
+ EventSourceTypeNames = makeInverseMap(EventSourceType); |
LogLevelType = Constants.logLevelType; |
ClientInfo = Constants.clientInfo; |
LoadFlag = Constants.loadFlag; |
@@ -265,10 +265,10 @@ ConstantsObserver.prototype.onReceivedConstants = function(receivedConstants) { |
*/ |
function areValidConstants(receivedConstants) { |
return typeof(receivedConstants) == 'object' && |
- typeof(receivedConstants.logEventTypes) == 'object' && |
+ typeof(receivedConstants.eventType) == 'object' && |
typeof(receivedConstants.clientInfo) == 'object' && |
- typeof(receivedConstants.logEventPhase) == 'object' && |
- typeof(receivedConstants.logSourceType) == 'object' && |
+ typeof(receivedConstants.eventPhase) == 'object' && |
+ typeof(receivedConstants.sourceType) == 'object' && |
mmenke
2012/06/08 00:12:51
Ditto.
|
typeof(receivedConstants.logLevelType) == 'object' && |
typeof(receivedConstants.loadFlag) == 'object' && |
typeof(receivedConstants.netError) == 'object' && |