From 41fabf8e2dd3a847cbdad05da9b43fd9a99d741a Mon Sep 17 00:00:00 2001 From: "etienneb@chromium.org" Date: Sun, 9 Mar 2014 03:59:50 +0000 Subject: Implements Windows system tracing. This CL brings the tracing information into the resulting JSon. As tracing needs administrator rights, we assume that Chrome is launched as administrator. To be able to view events, the traceviewer part must land first. see: https://codereview.appspot.com/51300043/ BUG= Review URL: https://codereview.chromium.org/171143002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255818 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/tracing/tracing_controller_impl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '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 72a9913..d4d5722 100644 --- a/content/browser/tracing/tracing_controller_impl.h +++ b/content/browser/tracing/tracing_controller_impl.h @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -116,7 +116,7 @@ class TracingControllerImpl : public TracingController { void OnDisableRecordingComplete(); void OnResultFileClosed(); -#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) || defined(OS_WIN) void OnEndSystemTracingAcked( const scoped_refptr& events_str_ptr); #endif @@ -161,7 +161,7 @@ class TracingControllerImpl : public TracingController { TraceMessageFilterSet pending_trace_buffer_percent_full_filters_; float maximum_trace_buffer_percent_full_; -#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) || defined(OS_WIN) bool is_system_tracing_; #endif bool is_recording_; -- cgit v1.1