chrome/app/chrome_main.cc - Issue 7748042: Merge trunk r97497 and its many dependents to the 14.0.835 branch.

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/app/chrome_main.cc

Issue 7748042: Merge trunk r97497 and its many dependents to the 14.0.835 branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/

Patch Set: Created 9 years, 4 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 side-by-side diff with in-line comments

Download patch

Index: chrome/app/chrome_main.cc

===================================================================

--- chrome/app/chrome_main.cc (revision 98423)

+++ chrome/app/chrome_main.cc (working copy)

@@ -65,6 +65,7 @@

#include "chrome/app/breakpad_mac.h"

#include "chrome/browser/mac/relauncher.h"

#include "chrome/common/chrome_paths_internal.h"

+#include "chrome/common/mac/cfbundle_blocker.h"

#include "content/browser/mach_broker_mac.h"

#include "grit/chromium_strings.h"

#include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h"

@@ -588,6 +589,7 @@

#if defined(OS_MACOSX)

chrome_main::SetUpBundleOverrides();

+ chrome::common::mac::EnableCFBundleBlocker();

#endif

CommandLine::Init(argc, argv);

« no previous file with comments | « no previous file | chrome/browser/chrome_browser_application_mac.mm » ('j') | no next file with comments »