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

Side by Side Diff: chrome/browser/chrome_browser_main.h

Issue 12096114: Extract locking behaviour from ProcessSingleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename test suite. Created 7 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 5 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
6 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 6 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
11 #include "base/tracked_objects.h" 11 #include "base/tracked_objects.h"
12 #include "chrome/browser/chrome_browser_field_trials.h" 12 #include "chrome/browser/chrome_browser_field_trials.h"
13 #include "chrome/browser/chrome_process_singleton.h"
13 #include "chrome/browser/first_run/first_run.h" 14 #include "chrome/browser/first_run/first_run.h"
14 #include "chrome/browser/process_singleton.h" 15 #include "chrome/browser/process_singleton.h"
15 #include "chrome/browser/task_profiler/auto_tracking.h" 16 #include "chrome/browser/task_profiler/auto_tracking.h"
16 #include "chrome/browser/ui/startup/startup_browser_creator.h" 17 #include "chrome/browser/ui/startup/startup_browser_creator.h"
17 #include "content/public/browser/browser_main_parts.h" 18 #include "content/public/browser/browser_main_parts.h"
18 #include "content/public/browser/render_view_host.h" 19 #include "content/public/browser/render_view_host.h"
19 20
20 class ActiveTabTracker; 21 class ActiveTabTracker;
21 class BrowserProcessImpl; 22 class BrowserProcessImpl;
22 class ChromeBrowserMainExtraParts; 23 class ChromeBrowserMainExtraParts;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 164
164 scoped_ptr<BrowserProcessImpl> browser_process_; 165 scoped_ptr<BrowserProcessImpl> browser_process_;
165 scoped_refptr<chrome_browser_metrics::TrackingSynchronizer> 166 scoped_refptr<chrome_browser_metrics::TrackingSynchronizer>
166 tracking_synchronizer_; 167 tracking_synchronizer_;
167 #if !defined(OS_ANDROID) 168 #if !defined(OS_ANDROID)
168 // Browser creation happens on the Java side in Android. 169 // Browser creation happens on the Java side in Android.
169 scoped_ptr<StartupBrowserCreator> browser_creator_; 170 scoped_ptr<StartupBrowserCreator> browser_creator_;
170 171
171 // Android doesn't support multiple browser processes, so it doesn't implement 172 // Android doesn't support multiple browser processes, so it doesn't implement
172 // ProcessSingleton. 173 // ProcessSingleton.
173 scoped_ptr<ProcessSingleton> process_singleton_; 174 scoped_ptr<ChromeProcessSingleton> process_singleton_;
174 #endif 175 #endif
175 scoped_ptr<first_run::MasterPrefs> master_prefs_; 176 scoped_ptr<first_run::MasterPrefs> master_prefs_;
176 bool record_search_engine_; 177 bool record_search_engine_;
177 TranslateManager* translate_manager_; 178 TranslateManager* translate_manager_;
178 Profile* profile_; 179 Profile* profile_;
179 bool run_message_loop_; 180 bool run_message_loop_;
180 ProcessSingleton::NotifyResult notify_result_; 181 ProcessSingleton::NotifyResult notify_result_;
181 scoped_ptr<ThreeDAPIObserver> three_d_observer_; 182 scoped_ptr<ThreeDAPIObserver> three_d_observer_;
182 183
183 // Initialized in SetupMetricsAndFieldTrials. 184 // Initialized in SetupMetricsAndFieldTrials.
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 // Records the time from our process' startup to the present time in 217 // Records the time from our process' startup to the present time in
217 // the Startup.BrowserMessageLoopStartTime UMA histogram. 218 // the Startup.BrowserMessageLoopStartTime UMA histogram.
218 void RecordBrowserStartupTime(); 219 void RecordBrowserStartupTime();
219 220
220 // Records a time value to an UMA histogram in the context of the 221 // Records a time value to an UMA histogram in the context of the
221 // PreReadExperiment field-trial. This also reports to the appropriate 222 // PreReadExperiment field-trial. This also reports to the appropriate
222 // sub-histogram (_PreRead(Enabled|Disabled)). 223 // sub-histogram (_PreRead(Enabled|Disabled)).
223 void RecordPreReadExperimentTime(const char* name, base::TimeDelta time); 224 void RecordPreReadExperimentTime(const char* name, base::TimeDelta time);
224 225
225 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 226 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | chrome/browser/chrome_process_singleton.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698