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.

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/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

« chrome/browser/browser_process_impl.h ('K') | « chrome/browser/chrome_browser_main_win.cc ('k') | chrome/browser/ui/startup/startup_browser_creator.cc » ('j') | chrome/browser/ui/startup/startup_browser_creator.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"

@@ -370,8 +371,11 @@

return PROCESS_NOTIFIED; // We already spawned the process in this case.

if (lock_file_ == INVALID_HANDLE_VALUE && !remote_window_)

return LOCK_ERROR;

- else if (!remote_window_)

+ else if (!remote_window_) {

Ben Goodger (Google) 2012/11/27 16:56:41 nit: add braces to entire if..else.

ananta 2012/11/27 19:16:03 Done.

+ g_browser_process->PlatformSpecificCommandLineProcessing(

+ *CommandLine::ForCurrentProcess());

return PROCESS_NONE;

+ }

DWORD process_id = 0;

DWORD thread_id = GetWindowThreadProcessId(remote_window_, &process_id);