| Index: content/browser/tracing/tracing_controller_impl.h
|
| diff --git a/content/browser/tracing/tracing_controller_impl.h b/content/browser/tracing/tracing_controller_impl.h
|
| index 3f80b7a6ac0624025562ad9783d81bb5a27d6640..9bd84200d45f276f9c5b84886afa5d9290964818 100644
|
| --- a/content/browser/tracing/tracing_controller_impl.h
|
| +++ b/content/browser/tracing/tracing_controller_impl.h
|
| @@ -27,32 +27,28 @@ class TracingControllerImpl : public TracingController {
|
| static TracingControllerImpl* GetInstance();
|
|
|
| // TracingController implementation.
|
| - virtual bool GetCategories(
|
| - const GetCategoriesDoneCallback& callback) override;
|
| - virtual bool EnableRecording(
|
| - const base::debug::CategoryFilter& category_filter,
|
| - const base::debug::TraceOptions& trace_options,
|
| - const EnableRecordingDoneCallback& callback) override;
|
| - virtual bool DisableRecording(
|
| - const scoped_refptr<TraceDataSink>& sink) override;
|
| - virtual bool EnableMonitoring(
|
| - const base::debug::CategoryFilter& category_filter,
|
| - const base::debug::TraceOptions& trace_options,
|
| - const EnableMonitoringDoneCallback& callback) override;
|
| - virtual bool DisableMonitoring(
|
| + bool GetCategories(const GetCategoriesDoneCallback& callback) override;
|
| + bool EnableRecording(const base::debug::CategoryFilter& category_filter,
|
| + const base::debug::TraceOptions& trace_options,
|
| + const EnableRecordingDoneCallback& callback) override;
|
| + bool DisableRecording(const scoped_refptr<TraceDataSink>& sink) override;
|
| + bool EnableMonitoring(const base::debug::CategoryFilter& category_filter,
|
| + const base::debug::TraceOptions& trace_options,
|
| + const EnableMonitoringDoneCallback& callback) override;
|
| + bool DisableMonitoring(
|
| const DisableMonitoringDoneCallback& callback) override;
|
| - virtual void GetMonitoringStatus(
|
| + void GetMonitoringStatus(
|
| bool* out_enabled,
|
| base::debug::CategoryFilter* out_category_filter,
|
| base::debug::TraceOptions* out_trace_options) override;
|
| - virtual bool CaptureMonitoringSnapshot(
|
| + bool CaptureMonitoringSnapshot(
|
| const scoped_refptr<TraceDataSink>& sink) override;
|
| - virtual bool GetTraceBufferPercentFull(
|
| + bool GetTraceBufferPercentFull(
|
| const GetTraceBufferPercentFullCallback& callback) override;
|
| - virtual bool SetWatchEvent(const std::string& category_name,
|
| - const std::string& event_name,
|
| - const WatchEventCallback& callback) override;
|
| - virtual bool CancelWatchEvent() override;
|
| + bool SetWatchEvent(const std::string& category_name,
|
| + const std::string& event_name,
|
| + const WatchEventCallback& callback) override;
|
| + bool CancelWatchEvent() override;
|
|
|
| void RegisterTracingUI(TracingUI* tracing_ui);
|
| void UnregisterTracingUI(TracingUI* tracing_ui);
|
| @@ -64,7 +60,7 @@ class TracingControllerImpl : public TracingController {
|
| friend class TraceMessageFilter;
|
|
|
| TracingControllerImpl();
|
| - virtual ~TracingControllerImpl();
|
| + ~TracingControllerImpl() override;
|
|
|
| bool can_enable_recording() const {
|
| return !is_recording_;
|
|
|