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

Unified 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: missed merge. Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_browser_main.h
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index ae963032e85154e3c90a88da59f5e49070da26ff..c223191fc86dc6635974a27a8dd981f54997b59f 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -13,7 +13,9 @@
#include "base/tracked_objects.h"
#include "chrome/browser/chrome_browser_field_trials.h"
#include "chrome/browser/first_run/first_run.h"
+#include "chrome/browser/modal_dialog_lock.h"
#include "chrome/browser/process_singleton.h"
+#include "chrome/browser/process_singleton_lock.h"
#include "chrome/browser/task_profiler/auto_tracking.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "content/public/browser/browser_main_parts.h"
@@ -169,6 +171,8 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
// Android doesn't support multiple browser processes, so it doesn't implement
// ProcessSingleton.
+ ProcessSingletonLock process_singleton_lock_;
+ ModalDialogLock modal_dialog_lock_;
scoped_ptr<ProcessSingleton> process_singleton_;
#endif
scoped_ptr<first_run::MasterPrefs> master_prefs_;
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | chrome/browser/first_run/try_chrome_dialog_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698