| Index: chrome/browser/process_singleton_win.cc
|
| diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
|
| index c46ea99b9c763b722df21fe2a6a500701c2ea230..427c6c617254eb42b45e40d49c0cbc0f4eff43a6 100644
|
| --- a/chrome/browser/process_singleton_win.cc
|
| +++ b/chrome/browser/process_singleton_win.cc
|
| @@ -25,9 +25,9 @@
|
| #include "base/win/windows_version.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/browser_process_platform_part.h"
|
| -#include "chrome/browser/chrome_process_finder_win.h"
|
| #include "chrome/browser/shell_integration.h"
|
| #include "chrome/browser/ui/simple_message_box.h"
|
| +#include "chrome/browser/win/chrome_process_finder.h"
|
| #include "chrome/common/channel_info.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_paths.h"
|
| @@ -273,7 +273,7 @@ bool ProcessSingleton::EscapeVirtualization(
|
| HWND hwnd = 0;
|
| ::Sleep(90);
|
| for (int tries = 200; tries; --tries) {
|
| - hwnd = chrome::FindRunningChromeWindow(user_data_dir);
|
| + hwnd = chrome::win::FindRunningChromeWindow(user_data_dir);
|
| if (hwnd) {
|
| ::SetForegroundWindow(hwnd);
|
| break;
|
| @@ -311,13 +311,13 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
|
| return PROCESS_NONE;
|
| }
|
|
|
| - switch (chrome::AttemptToNotifyRunningChrome(remote_window_, false)) {
|
| - case chrome::NOTIFY_SUCCESS:
|
| + switch (chrome::win::AttemptToNotifyRunningChrome(remote_window_, false)) {
|
| + case chrome::win::NOTIFY_SUCCESS:
|
| return PROCESS_NOTIFIED;
|
| - case chrome::NOTIFY_FAILED:
|
| + case chrome::win::NOTIFY_FAILED:
|
| remote_window_ = NULL;
|
| return PROCESS_NONE;
|
| - case chrome::NOTIFY_WINDOW_HUNG:
|
| + case chrome::win::NOTIFY_WINDOW_HUNG:
|
| // Fall through and potentially terminate the hung browser.
|
| break;
|
| }
|
| @@ -380,7 +380,7 @@ ProcessSingleton::NotifyOtherProcessOrCreate() {
|
| bool ProcessSingleton::Create() {
|
| static const wchar_t kMutexName[] = L"Local\\ChromeProcessSingletonStartup!";
|
|
|
| - remote_window_ = chrome::FindRunningChromeWindow(user_data_dir_);
|
| + remote_window_ = chrome::win::FindRunningChromeWindow(user_data_dir_);
|
| if (!remote_window_ && !EscapeVirtualization(user_data_dir_)) {
|
| // Make sure we will be the one and only process creating the window.
|
| // We use a named Mutex since we are protecting against multi-process
|
| @@ -399,7 +399,7 @@ bool ProcessSingleton::Create() {
|
| // window at this time, but we must still check if someone created it
|
| // between the time where we looked for it above and the time the mutex
|
| // was given to us.
|
| - remote_window_ = chrome::FindRunningChromeWindow(user_data_dir_);
|
| + remote_window_ = chrome::win::FindRunningChromeWindow(user_data_dir_);
|
|
|
| if (!remote_window_) {
|
| // We have to make sure there is no Chrome instance running on another
|
|
|