chrome/app/chrome_exe_main.cc - Issue 1718024: Revert r46023: "Detect new instance of the browser when running in the background in persistent"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/app/chrome_exe_main.cc

Issue 1718024: Revert r46023: "Detect new instance of the browser when running in the background in persistent" (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 7 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:

View unified diff | Download patch

« no previous file with comments | « no previous file | chrome/app/chrome_exe_main_gtk.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include <windows.h>	5 #include <windows.h>

6 #include <tchar.h>	6 #include <tchar.h>

7	7

8 #include "base/at_exit.h"	8 #include "base/at_exit.h"

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/win_util.h"	10 #include "base/win_util.h"

(...skipping 26 matching lines...) Expand all Loading...
37 if (!sandbox_info.broker_services)	37 if (!sandbox_info.broker_services)

38 sandbox_info.target_services = sandbox::SandboxFactory::GetTargetServices();	38 sandbox_info.target_services = sandbox::SandboxFactory::GetTargetServices();

39	39

40 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {	40 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {

41 // Enforces strong DEP support. Vista uses the NXCOMPAT flag in the exe.	41 // Enforces strong DEP support. Vista uses the NXCOMPAT flag in the exe.

42 sandbox::SetCurrentProcessDEP(sandbox::DEP_ENABLED);	42 sandbox::SetCurrentProcessDEP(sandbox::DEP_ENABLED);

43 }	43 }

44 // Load and launch the chrome dll. Everything happens inside.	44 // Load and launch the chrome dll. Everything happens inside.

45 MainDllLoader* loader = MakeMainDllLoader();	45 MainDllLoader* loader = MakeMainDllLoader();

46 int rc = loader->Launch(instance, &sandbox_info);	46 int rc = loader->Launch(instance, &sandbox_info);

47 loader->RelaunchChromeBrowserWithNewCommandLineIfNeeded();

48 delete loader;	47 delete loader;

49	48

50 return rc;	49 return rc;

51 }	50 }

OLD	NEW