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

Unified Diff: chrome/browser/process_singleton_win.cc

Issue 11299192: Ensure that Metro chrome in ASH is able to connect to an existing desktop chrome AURA process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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/process_singleton_win.cc
===================================================================
--- chrome/browser/process_singleton_win.cc (revision 169477)
+++ chrome/browser/process_singleton_win.cc (working copy)
@@ -22,6 +22,7 @@
#include "base/win/win_util.h"
#include "base/win/windows_version.h"
#include "base/win/wrapped_window_proc.h"
+#include "chrome/browser/browser_process.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/ui/simple_message_box.h"
#include "chrome/common/chrome_constants.h"
@@ -368,10 +369,13 @@
ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
if (is_virtualized_)
return PROCESS_NOTIFIED; // We already spawned the process in this case.
- if (lock_file_ == INVALID_HANDLE_VALUE && !remote_window_)
+ if (lock_file_ == INVALID_HANDLE_VALUE && !remote_window_) {
return LOCK_ERROR;
- else if (!remote_window_)
+ } else if (!remote_window_) {
+ g_browser_process->PlatformSpecificCommandLineProcessing(
+ *CommandLine::ForCurrentProcess());
return PROCESS_NONE;
+ }
DWORD process_id = 0;
DWORD thread_id = GetWindowThreadProcessId(remote_window_, &process_id);

Powered by Google App Engine
This is Rietveld 408576698