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

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

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/memory_dump_provider.h" 5 #include "base/trace_event/memory_dump_provider.h"
6 6
7 #include "base/logging.h" 7 #include "base/single_thread_task_runner.h"
8 8
9 namespace base { 9 namespace base {
10 namespace trace_event { 10 namespace trace_event {
11 11
12 MemoryDumpProvider::MemoryDumpProvider() { 12 MemoryDumpProvider::MemoryDumpProvider() {
13 } 13 }
14 14
15 MemoryDumpProvider::MemoryDumpProvider(
16 const scoped_refptr<SingleThreadTaskRunner>& task_runner)
17 : task_runner_(task_runner) {
18 }
19
15 MemoryDumpProvider::~MemoryDumpProvider() { 20 MemoryDumpProvider::~MemoryDumpProvider() {
16 } 21 }
17 22
18 void MemoryDumpProvider::DeclareAllocatorAttribute( 23 void MemoryDumpProvider::DeclareAllocatorAttribute(
19 const MemoryAllocatorDeclaredAttribute& attr) { 24 const std::string& allocator_name,
20 DCHECK_EQ(0u, allocator_attributes_.count(attr.name)) 25 const std::string& attribute_name,
21 << "Allocator attribute " << attr.name << " already declared for dumper " 26 const std::string& attribute_type) {
22 << GetFriendlyName(); 27 allocator_attributes_type_info_.Set(
23 allocator_attributes_[attr.name] = attr; 28 allocator_name, attribute_name, attribute_type);
24 } 29 }
25 30
26 } // namespace trace_event 31 } // namespace trace_event
27 } // namespace base 32 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698