From 116680a4aac90f2aa7413d9095a592090648e557 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Sun, 20 Jul 2014 18:25:52 -0700 Subject: Merge from Chromium at DEPS revision 284076 This commit was generated by merge_to_master.py. Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae --- content/browser/browser_main_loop.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'content/browser/browser_main_loop.h') diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h index f38ac4234a..14370fd3b3 100644 --- a/content/browser/browser_main_loop.h +++ b/content/browser/browser_main_loop.h @@ -6,8 +6,10 @@ #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ #include "base/basictypes.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/timer/timer.h" #include "content/browser/browser_process_sub_thread.h" #include "content/public/browser/browser_main_runner.h" @@ -104,6 +106,12 @@ class CONTENT_EXPORT BrowserMainLoop { bool is_tracing_startup() const { return is_tracing_startup_; } + const base::FilePath& startup_trace_file() const { + return startup_trace_file_; + } + + void StopStartupTracingTimer(); + #if defined(OS_MACOSX) && !defined(OS_IOS) DeviceMonitorMac* device_monitor_mac() const { return device_monitor_mac_.get(); @@ -130,8 +138,10 @@ class CONTENT_EXPORT BrowserMainLoop { void MainMessageLoopRun(); + base::FilePath GetStartupTraceFileName( + const base::CommandLine& command_line) const; void InitStartupTracing(const base::CommandLine& command_line); - void EndStartupTracing(const base::FilePath& trace_file); + void EndStartupTracing(); // Members initialized on construction --------------------------------------- const MainFunctionParams& parameters_; @@ -190,6 +200,10 @@ class CONTENT_EXPORT BrowserMainLoop { scoped_ptr system_stats_monitor_; bool is_tracing_startup_; + base::FilePath startup_trace_file_; + + // This timer initiates trace file saving. + base::OneShotTimer startup_trace_timer_; DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); }; -- cgit v1.2.3