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

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

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Getting rid of BrowserStartupController changes Created 5 years, 2 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
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 <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 base::trace_event::TraceConfig TraceConfigFile::GetTraceConfig() const { 123 base::trace_event::TraceConfig TraceConfigFile::GetTraceConfig() const {
124 DCHECK(IsEnabled()); 124 DCHECK(IsEnabled());
125 return trace_config_; 125 return trace_config_;
126 } 126 }
127 127
128 int TraceConfigFile::GetStartupDuration() const { 128 int TraceConfigFile::GetStartupDuration() const {
129 DCHECK(IsEnabled()); 129 DCHECK(IsEnabled());
130 return startup_duration_; 130 return startup_duration_;
131 } 131 }
132 132
133 #if !defined(OS_ANDROID) 133 #if !defined(OS_ANDROID) || defined(USE_AURA)
134 base::FilePath TraceConfigFile::GetResultFile() const { 134 base::FilePath TraceConfigFile::GetResultFile() const {
135 DCHECK(IsEnabled()); 135 DCHECK(IsEnabled());
136 return result_file_; 136 return result_file_;
137 } 137 }
138 #endif 138 #endif
139 139
140 } // namespace tracing 140 } // namespace tracing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698