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

Side by Side Diff: components/tracing/trace_config_file.cc

Issue 1649483002: Revert of Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Merging android_non_aura_browser_sources into android_browser_sources rather than private_browser_s… Created 4 years, 11 months 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
« no previous file with comments | « components/tracing/trace_config_file.h ('k') | content/app/android/library_loader_hooks.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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 "components/tracing/trace_config_file.h" 5 #include "components/tracing/trace_config_file.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 base::trace_event::TraceConfig TraceConfigFile::GetTraceConfig() const { 132 base::trace_event::TraceConfig TraceConfigFile::GetTraceConfig() const {
133 DCHECK(IsEnabled()); 133 DCHECK(IsEnabled());
134 return trace_config_; 134 return trace_config_;
135 } 135 }
136 136
137 int TraceConfigFile::GetStartupDuration() const { 137 int TraceConfigFile::GetStartupDuration() const {
138 DCHECK(IsEnabled()); 138 DCHECK(IsEnabled());
139 return startup_duration_; 139 return startup_duration_;
140 } 140 }
141 141
142 #if !defined(OS_ANDROID) || defined(USE_AURA) 142 #if !defined(OS_ANDROID)
143 base::FilePath TraceConfigFile::GetResultFile() const { 143 base::FilePath TraceConfigFile::GetResultFile() const {
144 DCHECK(IsEnabled()); 144 DCHECK(IsEnabled());
145 return result_file_; 145 return result_file_;
146 } 146 }
147 #endif 147 #endif
148 148
149 } // namespace tracing 149 } // namespace tracing
OLDNEW
« no previous file with comments | « components/tracing/trace_config_file.h ('k') | content/app/android/library_loader_hooks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698