Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Side by Side Diff: net/base/net_log.cc

Issue 2965015: Attempt four at landing the "histogram.h removed from message_loop.h" patch. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: win build fixes Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/base/net_log.h ('k') | net/base/net_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/net_log.h" 5 #include "net/base/net_log.h"
6 #include "base/string_util.h" 6 #include "base/string_util.h"
7 #include "base/time.h"
7 #include "base/values.h" 8 #include "base/values.h"
8 9
9 namespace net { 10 namespace net {
10 11
11 // static 12 // static
12 const char* NetLog::EventTypeToString(EventType event) { 13 const char* NetLog::EventTypeToString(EventType event) {
13 switch (event) { 14 switch (event) {
14 #define EVENT_TYPE(label) case TYPE_ ## label: return #label; 15 #define EVENT_TYPE(label) case TYPE_ ## label: return #label;
15 #include "net/base/net_log_event_type_list.h" 16 #include "net/base/net_log_event_type_list.h"
16 #undef EVENT_TYPE 17 #undef EVENT_TYPE
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 103
103 DictionaryValue* source_dict = new DictionaryValue(); 104 DictionaryValue* source_dict = new DictionaryValue();
104 source_dict->SetInteger(L"type", static_cast<int>(value_.type)); 105 source_dict->SetInteger(L"type", static_cast<int>(value_.type));
105 source_dict->SetInteger(L"id", static_cast<int>(value_.id)); 106 source_dict->SetInteger(L"id", static_cast<int>(value_.id));
106 107
107 dict->Set(ASCIIToWide(name_), source_dict); 108 dict->Set(ASCIIToWide(name_), source_dict);
108 return dict; 109 return dict;
109 } 110 }
110 111
111 } // namespace net 112 } // namespace net
OLDNEW
« no previous file with comments | « net/base/net_log.h ('k') | net/base/net_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698