diff options
| author | mfomitchev <mfomitchev@chromium.org> | 2015-11-06 18:03:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-07 02:04:03 +0000 |
| commit | 841f818387cab380b6b21158ad94c9b256bb9c32 (patch) | |
| tree | 007e81f0dc8aed65b4798ad4889fe0c914fc3ad3 /components/tracing | |
| parent | ac9a274402cc273473c84f6e0ebe521ba7b7afa0 (diff) | |
| download | chromium_src-841f818387cab380b6b21158ad94c9b256bb9c32.zip chromium_src-841f818387cab380b6b21158ad94c9b256bb9c32.tar.gz chromium_src-841f818387cab380b6b21158ad94c9b256bb9c32.tar.bz2 | |
Aura on Android: content/browser
Changes necessary to get content/browser, content/public/browser, and content/child GN targets to build.
BUG=507792
Review URL: https://codereview.chromium.org/1411503005
Cr-Commit-Position: refs/heads/master@{#358496}
Diffstat (limited to 'components/tracing')
| -rw-r--r-- | components/tracing/trace_config_file.cc | 2 | ||||
| -rw-r--r-- | components/tracing/trace_config_file.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/tracing/trace_config_file.cc b/components/tracing/trace_config_file.cc index 95e3924..f1df192 100644 --- a/components/tracing/trace_config_file.cc +++ b/components/tracing/trace_config_file.cc @@ -130,7 +130,7 @@ int TraceConfigFile::GetStartupDuration() const { return startup_duration_; } -#if !defined(OS_ANDROID) +#if !defined(OS_ANDROID) || defined(USE_AURA) base::FilePath TraceConfigFile::GetResultFile() const { DCHECK(IsEnabled()); return result_file_; diff --git a/components/tracing/trace_config_file.h b/components/tracing/trace_config_file.h index 863fee4..0834fc2 100644 --- a/components/tracing/trace_config_file.h +++ b/components/tracing/trace_config_file.h @@ -70,7 +70,7 @@ class TRACING_EXPORT TraceConfigFile { bool IsEnabled() const; base::trace_event::TraceConfig GetTraceConfig() const; int GetStartupDuration() const; -#if !defined(OS_ANDROID) +#if !defined(OS_ANDROID) || defined(USE_AURA) base::FilePath GetResultFile() const; #endif |