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

Side by Side Diff: base/trace_event/trace_event_win.cc

Issue 1218243002: Fix some clang warnings with -Wmissing-braces in base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 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 | « base/time/time_win.cc ('k') | base/win/scoped_comptr_unittest.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/trace_event/trace_event_win.h" 5 #include "base/trace_event/trace_event_win.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include <initguid.h> // NOLINT 9 #include <initguid.h> // NOLINT
10 10
11 namespace base { 11 namespace base {
12 namespace trace_event { 12 namespace trace_event {
13 13
14 using base::win::EtwEventType; 14 using base::win::EtwEventType;
15 using base::win::EtwMofEvent; 15 using base::win::EtwMofEvent;
16 16
17 // {3DADA31D-19EF-4dc1-B345-037927193422} 17 // {3DADA31D-19EF-4dc1-B345-037927193422}
18 const GUID kChromeTraceProviderName = { 18 const GUID kChromeTraceProviderName = {
19 0x3dada31d, 0x19ef, 0x4dc1, 0xb3, 0x45, 0x3, 0x79, 0x27, 0x19, 0x34, 0x22 }; 19 0x3dada31d,
20 0x19ef,
21 0x4dc1,
22 {0xb3, 0x45, 0x3, 0x79, 0x27, 0x19, 0x34, 0x22}};
20 23
21 // {B967AE67-BB22-49d7-9406-55D91EE1D560} 24 // {B967AE67-BB22-49d7-9406-55D91EE1D560}
22 const GUID kTraceEventClass32 = { 25 const GUID kTraceEventClass32 = {
23 0xb967ae67, 0xbb22, 0x49d7, 0x94, 0x6, 0x55, 0xd9, 0x1e, 0xe1, 0xd5, 0x60 }; 26 0xb967ae67,
27 0xbb22,
28 0x49d7,
29 {0x94, 0x6, 0x55, 0xd9, 0x1e, 0xe1, 0xd5, 0x60}};
24 30
25 // {97BE602D-2930-4ac3-8046-B6763B631DFE} 31 // {97BE602D-2930-4ac3-8046-B6763B631DFE}
26 const GUID kTraceEventClass64 = { 32 const GUID kTraceEventClass64 = {
27 0x97be602d, 0x2930, 0x4ac3, 0x80, 0x46, 0xb6, 0x76, 0x3b, 0x63, 0x1d, 0xfe}; 33 0x97be602d,
28 34 0x2930,
35 0x4ac3,
36 {0x80, 0x46, 0xb6, 0x76, 0x3b, 0x63, 0x1d, 0xfe}};
29 37
30 TraceEventETWProvider::TraceEventETWProvider() : 38 TraceEventETWProvider::TraceEventETWProvider() :
31 EtwTraceProvider(kChromeTraceProviderName) { 39 EtwTraceProvider(kChromeTraceProviderName) {
32 Register(); 40 Register();
33 } 41 }
34 42
35 TraceEventETWProvider* TraceEventETWProvider::GetInstance() { 43 TraceEventETWProvider* TraceEventETWProvider::GetInstance() {
36 return Singleton<TraceEventETWProvider, 44 return Singleton<TraceEventETWProvider,
37 StaticMemorySingletonTraits<TraceEventETWProvider> >::get(); 45 StaticMemorySingletonTraits<TraceEventETWProvider> >::get();
38 } 46 }
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 provider->TraceEvent(name, name_len, type, id, extra, extra_len); 123 provider->TraceEvent(name, name_len, type, id, extra, extra_len);
116 } 124 }
117 } 125 }
118 126
119 void TraceEventETWProvider::Resurrect() { 127 void TraceEventETWProvider::Resurrect() {
120 StaticMemorySingletonTraits<TraceEventETWProvider>::Resurrect(); 128 StaticMemorySingletonTraits<TraceEventETWProvider>::Resurrect();
121 } 129 }
122 130
123 } // namespace trace_event 131 } // namespace trace_event
124 } // namespace base 132 } // namespace base
OLDNEW
« no previous file with comments | « base/time/time_win.cc ('k') | base/win/scoped_comptr_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698