chrome/browser/chrome_browser_main.h - Issue 12096114: Extract locking behaviour from ProcessSingleton.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Restrict chrome_process_singleton_unittest to WIN for now. 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:

Index: chrome/browser/chrome_browser_main.h

diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h

index 0f03cbb98a287912eee800d18cd0cefead874f4d..bd8f03ef5af88e861b43aca81f3d6a1914e2e76a 100644

--- a/chrome/browser/chrome_browser_main.h

+++ b/chrome/browser/chrome_browser_main.h

@@ -10,6 +10,7 @@

#include "base/metrics/field_trial.h"

#include "base/tracked_objects.h"

#include "chrome/browser/chrome_browser_field_trials.h"

+#include "chrome/browser/chrome_process_singleton.h"

#include "chrome/browser/first_run/first_run.h"

#include "chrome/browser/process_singleton.h"

#include "chrome/browser/task_profiler/auto_tracking.h"

@@ -170,7 +171,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {

// Android doesn't support multiple browser processes, so it doesn't implement

// ProcessSingleton.

- scoped_ptr<ProcessSingleton> process_singleton_;

+ scoped_ptr<ChromeProcessSingleton> process_singleton_;

#endif

scoped_ptr<first_run::MasterPrefs> master_prefs_;

bool record_search_engine_;