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

Side by Side Diff: chrome/browser/ui/webui/tracing_ui.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 1 month 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) 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 "chrome/browser/ui/webui/tracing_ui.h" 5 #include "chrome/browser/ui/webui/tracing_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 // 154 //
155 //////////////////////////////////////////////////////////////////////////////// 155 ////////////////////////////////////////////////////////////////////////////////
156 156
157 TracingMessageHandler::TracingMessageHandler() 157 TracingMessageHandler::TracingMessageHandler()
158 : select_trace_file_dialog_type_(ui::SelectFileDialog::SELECT_NONE), 158 : select_trace_file_dialog_type_(ui::SelectFileDialog::SELECT_NONE),
159 trace_enabled_(false), 159 trace_enabled_(false),
160 system_trace_in_progress_(false) { 160 system_trace_in_progress_(false) {
161 } 161 }
162 162
163 TracingMessageHandler::~TracingMessageHandler() { 163 TracingMessageHandler::~TracingMessageHandler() {
164 if (select_trace_file_dialog_) 164 if (select_trace_file_dialog_.get())
165 select_trace_file_dialog_->ListenerDestroyed(); 165 select_trace_file_dialog_->ListenerDestroyed();
166 166
167 // If we are the current subscriber, this will result in ending tracing. 167 // If we are the current subscriber, this will result in ending tracing.
168 TraceController::GetInstance()->CancelSubscriber(this); 168 TraceController::GetInstance()->CancelSubscriber(this);
169 169
170 // Shutdown any system tracing too. 170 // Shutdown any system tracing too.
171 if (system_trace_in_progress_) { 171 if (system_trace_in_progress_) {
172 #if defined(OS_CHROMEOS) 172 #if defined(OS_CHROMEOS)
173 chromeos::DBusThreadManager::Get()->GetDebugDaemonClient()-> 173 chromeos::DBusThreadManager::Get()->GetDebugDaemonClient()->
174 RequestStopSystemTracing( 174 RequestStopSystemTracing(
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 // 505 //
506 //////////////////////////////////////////////////////////////////////////////// 506 ////////////////////////////////////////////////////////////////////////////////
507 507
508 TracingUI::TracingUI(content::WebUI* web_ui) : WebUIController(web_ui) { 508 TracingUI::TracingUI(content::WebUI* web_ui) : WebUIController(web_ui) {
509 web_ui->AddMessageHandler(new TracingMessageHandler()); 509 web_ui->AddMessageHandler(new TracingMessageHandler());
510 510
511 // Set up the chrome://tracing/ source. 511 // Set up the chrome://tracing/ source.
512 Profile* profile = Profile::FromWebUI(web_ui); 512 Profile* profile = Profile::FromWebUI(web_ui);
513 ChromeURLDataManager::AddDataSource(profile, CreateTracingHTMLSource()); 513 ChromeURLDataManager::AddDataSource(profile, CreateTracingHTMLSource());
514 } 514 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc ('k') | chrome/browser/ui/webui/web_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698