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

Side by Side Diff: base/trace_event/trace_event_argument.h

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/trace_event/trace_event.h ('k') | base/trace_event/trace_event_impl.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef BASE_TRACE_EVENT_TRACE_EVENT_ARGUMENT_H_ 5 #ifndef BASE_TRACE_EVENT_TRACE_EVENT_ARGUMENT_H_
6 #define BASE_TRACE_EVENT_TRACE_EVENT_ARGUMENT_H_ 6 #define BASE_TRACE_EVENT_TRACE_EVENT_ARGUMENT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 ListValue* GetCurrentArray(); 49 ListValue* GetCurrentArray();
50 50
51 scoped_ptr<base::Value> root_; 51 scoped_ptr<base::Value> root_;
52 std::vector<Value*> stack_; 52 std::vector<Value*> stack_;
53 DISALLOW_COPY_AND_ASSIGN(TracedValue); 53 DISALLOW_COPY_AND_ASSIGN(TracedValue);
54 }; 54 };
55 55
56 } // namespace trace_event 56 } // namespace trace_event
57 } // namespace base 57 } // namespace base
58 58
59 // TODO(ssid): remove these aliases after the tracing clients are moved to the
60 // new trace_event namespace. See crbug.com/451032. ETA: March 2015.
61 namespace base {
62 namespace debug {
63 using base::trace_event::TracedValue;
64 } // namespace debug
65 } // namespace base
66
67 #endif // BASE_TRACE_EVENT_TRACE_EVENT_ARGUMENT_H_ 59 #endif // BASE_TRACE_EVENT_TRACE_EVENT_ARGUMENT_H_
OLDNEW
« no previous file with comments | « base/trace_event/trace_event.h ('k') | base/trace_event/trace_event_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698