diff options
| author | etienneb@chromium.org <etienneb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-09 03:59:50 +0000 |
|---|---|---|
| committer | etienneb@chromium.org <etienneb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-09 03:59:50 +0000 |
| commit | 41fabf8e2dd3a847cbdad05da9b43fd9a99d741a (patch) | |
| tree | 81c9c57a37c658eb9d59ebba56b7fa3416993b52 /content/browser/tracing/tracing_controller_impl.h | |
| parent | 4fef343df71ae6f63227b55dd5cdaf2d732315e1 (diff) | |
| download | chromium_src-41fabf8e2dd3a847cbdad05da9b43fd9a99d741a.zip chromium_src-41fabf8e2dd3a847cbdad05da9b43fd9a99d741a.tar.gz chromium_src-41fabf8e2dd3a847cbdad05da9b43fd9a99d741a.tar.bz2 | |
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
Diffstat (limited to 'content/browser/tracing/tracing_controller_impl.h')
| -rw-r--r-- | content/browser/tracing/tracing_controller_impl.h | 6 |
1 files changed, 3 insertions, 3 deletions
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<base::RefCountedString>& 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_; |