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

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

Issue 7796030: Clean the SingletonLock only if there is no previous Chromium process running. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 3 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
11 #include "base/metrics/field_trial.h" 11 #include "base/metrics/field_trial.h"
12 #include "base/tracked_objects.h" 12 #include "base/tracked_objects.h"
13 #include "chrome/browser/first_run/first_run.h" 13 #include "chrome/browser/first_run/first_run.h"
14 #include "chrome/browser/process_singleton.h"
14 #include "content/browser/browser_main.h" 15 #include "content/browser/browser_main.h"
15 16
16 class BrowserProcessImpl; 17 class BrowserProcessImpl;
17 class FieldTrialSynchronizer; 18 class FieldTrialSynchronizer;
18 class HistogramSynchronizer; 19 class HistogramSynchronizer;
19 class MetricsService; 20 class MetricsService;
20 class PrefService; 21 class PrefService;
21 class ProcessSingleton;
22 class Profile; 22 class Profile;
23 class ShutdownWatcherHelper; 23 class ShutdownWatcherHelper;
24 class TranslateManager; 24 class TranslateManager;
25 25
26 namespace chrome_browser { 26 namespace chrome_browser {
27 // For use by ShowMissingLocaleMessageBox. 27 // For use by ShowMissingLocaleMessageBox.
28 extern const char kMissingLocaleDataTitle[]; 28 extern const char kMissingLocaleDataTitle[];
29 extern const char kMissingLocaleDataMessage[]; 29 extern const char kMissingLocaleDataMessage[];
30 } 30 }
31 31
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 // Members initialized after / released before main_message_loop_ ------------ 106 // Members initialized after / released before main_message_loop_ ------------
107 107
108 scoped_ptr<BrowserProcessImpl> browser_process_; 108 scoped_ptr<BrowserProcessImpl> browser_process_;
109 scoped_refptr<HistogramSynchronizer> histogram_synchronizer_; 109 scoped_refptr<HistogramSynchronizer> histogram_synchronizer_;
110 scoped_ptr<ProcessSingleton> process_singleton_; 110 scoped_ptr<ProcessSingleton> process_singleton_;
111 scoped_ptr<FirstRun::MasterPrefs> master_prefs_; 111 scoped_ptr<FirstRun::MasterPrefs> master_prefs_;
112 bool record_search_engine_; 112 bool record_search_engine_;
113 TranslateManager* translate_manager_; 113 TranslateManager* translate_manager_;
114 Profile* profile_; 114 Profile* profile_;
115 bool run_message_loop_; 115 bool run_message_loop_;
116 ProcessSingleton::NotifyResult notify_result_;
116 117
117 // Initialized in SetupMetricsAndFieldTrials. 118 // Initialized in SetupMetricsAndFieldTrials.
118 scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_; 119 scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_;
119 120
120 FRIEND_TEST(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket); 121 FRIEND_TEST(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket);
121 FRIEND_TEST(BrowserMainTest, WarmConnectionFieldTrial_Random); 122 FRIEND_TEST(BrowserMainTest, WarmConnectionFieldTrial_Random);
122 FRIEND_TEST(BrowserMainTest, WarmConnectionFieldTrial_Invalid); 123 FRIEND_TEST(BrowserMainTest, WarmConnectionFieldTrial_Invalid);
123 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts); 124 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
124 }; 125 };
125 126
(...skipping 13 matching lines...) Expand all
139 // Records the time from our process' startup to the present time in 140 // Records the time from our process' startup to the present time in
140 // the UMA histogram |metric_name|. 141 // the UMA histogram |metric_name|.
141 void RecordBrowserStartupTime(); 142 void RecordBrowserStartupTime();
142 143
143 // Records a time value to an UMA histogram in the context of the 144 // Records a time value to an UMA histogram in the context of the
144 // PreReadExperiment field-trial. This also reports to the appropriate 145 // PreReadExperiment field-trial. This also reports to the appropriate
145 // sub-histogram (_PreRead(Enabled|Disabled)). 146 // sub-histogram (_PreRead(Enabled|Disabled)).
146 void RecordPreReadExperimentTime(const char* name, base::TimeDelta time); 147 void RecordPreReadExperimentTime(const char* name, base::TimeDelta time);
147 148
148 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 149 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698