diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-22 16:37:55 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-22 16:37:55 +0000 |
| commit | 988394e21a592204a8ef1c85d544b021cb6e3de1 (patch) | |
| tree | 694da44963dbf0edc7b29c078d2db5995bc46f59 /net/base/net_log.h | |
| parent | 9ed2193c225c8fb9b77972911b6c2723e73d64ce (diff) | |
| download | chromium_src-988394e21a592204a8ef1c85d544b021cb6e3de1.zip chromium_src-988394e21a592204a8ef1c85d544b021cb6e3de1.tar.gz chromium_src-988394e21a592204a8ef1c85d544b021cb6e3de1.tar.bz2 | |
Remove hard-coded source ids from net_log_source_type_list.h,
as they're not needed.
R=eroman@chromium.org
BUG=114611
Review URL: http://codereview.chromium.org/9317059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123039 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_log.h')
| -rw-r--r-- | net/base/net_log.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/net/base/net_log.h b/net/base/net_log.h index d97c622..f2b4e76 100644 --- a/net/base/net_log.h +++ b/net/base/net_log.h @@ -7,7 +7,6 @@ #pragma once #include <string> -#include <vector> #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -36,6 +35,7 @@ class NET_EXPORT NetLog { #define EVENT_TYPE(label) TYPE_ ## label, #include "net/base/net_log_event_type_list.h" #undef EVENT_TYPE + EVENT_COUNT }; // The 'phase' of an event trace (whether it marks the beginning or end @@ -48,9 +48,10 @@ class NET_EXPORT NetLog { // The "source" identifies the entity that generated the log message. enum SourceType { -#define SOURCE_TYPE(label, value) SOURCE_ ## label = value, +#define SOURCE_TYPE(label) SOURCE_ ## label, #include "net/base/net_log_source_type_list.h" #undef SOURCE_TYPE + SOURCE_COUNT }; // Identifies the entity that generated this log. The |id| field should @@ -187,12 +188,17 @@ class NET_EXPORT NetLog { // Returns a C-String symbolic name for |event_type|. static const char* EventTypeToString(EventType event_type); - // Returns a list of all the available EventTypes. - static std::vector<EventType> GetAllEventTypes(); + // Returns a dictionary that maps event type symbolic names to their enum + // values. Caller takes ownership of the returned Value. + static base::Value* GetEventTypesAsValue(); // Returns a C-String symbolic name for |source_type|. static const char* SourceTypeToString(SourceType source_type); + // Returns a dictionary that maps source type symbolic names to their enum + // values. Caller takes ownership of the returned Value. + static base::Value* GetSourceTypesAsValue(); + // Returns a C-String symbolic name for |event_phase|. static const char* EventPhaseToString(EventPhase event_phase); |