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

Side by Side Diff: content/browser/tracing/tracing_controller_impl.cc

Issue 1545243002: Convert Pass()→std::move() in //content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #include "content/browser/tracing/tracing_controller_impl.h" 4 #include "content/browser/tracing/tracing_controller_impl.h"
5 5
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/cpu.h" 7 #include "base/cpu.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/json/string_escape.h" 9 #include "base/json/string_escape.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 127
128 scoped_ptr<TracingDelegate> delegate( 128 scoped_ptr<TracingDelegate> delegate(
129 GetContentClient()->browser()->GetTracingDelegate()); 129 GetContentClient()->browser()->GetTracingDelegate());
130 if (delegate) 130 if (delegate)
131 delegate->GenerateMetadataDict(metadata_dict.get()); 131 delegate->GenerateMetadataDict(metadata_dict.get());
132 132
133 // Highres ticks. 133 // Highres ticks.
134 metadata_dict->SetBoolean("highres-ticks", 134 metadata_dict->SetBoolean("highres-ticks",
135 base::TimeTicks::IsHighResolution()); 135 base::TimeTicks::IsHighResolution());
136 136
137 return metadata_dict.Pass(); 137 return metadata_dict;
138 } 138 }
139 139
140 } // namespace 140 } // namespace
141 141
142 TracingController* TracingController::GetInstance() { 142 TracingController* TracingController::GetInstance() {
143 return TracingControllerImpl::GetInstance(); 143 return TracingControllerImpl::GetInstance();
144 } 144 }
145 145
146 TracingControllerImpl::TracingControllerImpl() 146 TracingControllerImpl::TracingControllerImpl()
147 : pending_stop_tracing_ack_count_(0), 147 : pending_stop_tracing_ack_count_(0),
(...skipping 975 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 is_monitoring_ = is_monitoring; 1123 is_monitoring_ = is_monitoring;
1124 #if !defined(OS_ANDROID) 1124 #if !defined(OS_ANDROID)
1125 for (std::set<TracingUI*>::iterator it = tracing_uis_.begin(); 1125 for (std::set<TracingUI*>::iterator it = tracing_uis_.begin();
1126 it != tracing_uis_.end(); it++) { 1126 it != tracing_uis_.end(); it++) {
1127 (*it)->OnMonitoringStateChanged(is_monitoring); 1127 (*it)->OnMonitoringStateChanged(is_monitoring);
1128 } 1128 }
1129 #endif 1129 #endif
1130 } 1130 }
1131 1131
1132 } // namespace content 1132 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698