| Index: chrome/browser/process_singleton_win.cc
|
| diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
|
| index b8f5c206cbf4d168b0587416861dc8be1cbc8f6c..d3b6444fb8cd8389244f5d6218eeb3559fdb89e8 100644
|
| --- a/chrome/browser/process_singleton_win.cc
|
| +++ b/chrome/browser/process_singleton_win.cc
|
| @@ -366,6 +366,17 @@ ProcessSingleton::~ProcessSingleton() {
|
| CloseHandle(lock_file_);
|
| }
|
|
|
| +ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate(
|
| + const NotificationCallback& notification_callback) {
|
| + NotifyResult result = NotifyOtherProcess();
|
| + if (result != PROCESS_NONE)
|
| + return result;
|
| + return Create(notification_callback) ? PROCESS_NONE : PROFILE_IN_USE;
|
| +}
|
| +
|
| +void ProcessSingleton::Cleanup() {
|
| +}
|
| +
|
| ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
|
| if (is_virtualized_)
|
| return PROCESS_NOTIFIED; // We already spawned the process in this case.
|
| @@ -479,14 +490,6 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
|
| return PROCESS_NONE;
|
| }
|
|
|
| -ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate(
|
| - const NotificationCallback& notification_callback) {
|
| - NotifyResult result = NotifyOtherProcess();
|
| - if (result != PROCESS_NONE)
|
| - return result;
|
| - return Create(notification_callback) ? PROCESS_NONE : PROFILE_IN_USE;
|
| -}
|
| -
|
| // On Windows, there is no need to call Create() since the message
|
| // window is created in the constructor but to avoid having more
|
| // platform specific code in browser_main.cc we tolerate calls to
|
| @@ -502,9 +505,6 @@ bool ProcessSingleton::Create(
|
| return window_ != NULL;
|
| }
|
|
|
| -void ProcessSingleton::Cleanup() {
|
| -}
|
| -
|
| LRESULT ProcessSingleton::OnCopyData(HWND hwnd, const COPYDATASTRUCT* cds) {
|
| // If locked, it means we are not ready to process this message because
|
| // we are probably in a first run critical phase.
|
|
|