chrome/common/chrome_content_plugin_client.cc - Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets.

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/common/chrome_content_plugin_client.cc

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: simplify chrome_exe.gypi Created 9 years, 3 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 | Annotate | Revision Log

« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome/common/chrome_version_info.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "chrome/common/chrome_content_plugin_client.h"	5 #include "chrome/common/chrome_content_plugin_client.h"

6	6

7 #include "chrome/common/default_plugin.h"	7 #include "chrome/common/default_plugin.h"

8	8

9 #if defined(OS_MACOSX)	9 #if defined(OS_MACOSX)

10 #include "base/mac/mac_util.h"	10 #include "base/mac/mac_util.h"

(...skipping 12 matching lines...) Expand all Loading...
23 base::SysUTF16ToCFStringRef(plugin_name));	23 base::SysUTF16ToCFStringRef(plugin_name));

24 base::mac::ScopedCFTypeRef<CFStringRef> app_name(	24 base::mac::ScopedCFTypeRef<CFStringRef> app_name(

25 base::SysUTF16ToCFStringRef(	25 base::SysUTF16ToCFStringRef(

26 l10n_util::GetStringUTF16(IDS_SHORT_PLUGIN_APP_NAME)));	26 l10n_util::GetStringUTF16(IDS_SHORT_PLUGIN_APP_NAME)));

27 base::mac::ScopedCFTypeRef<CFStringRef> process_name(	27 base::mac::ScopedCFTypeRef<CFStringRef> process_name(

28 CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%@ (%@)"),	28 CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%@ (%@)"),

29 cf_plugin_name.get(), app_name.get()));	29 cf_plugin_name.get(), app_name.get()));

30 base::mac::SetProcessName(process_name);	30 base::mac::SetProcessName(process_name);

31 #endif	31 #endif

32	32

33 #if !defined(NACL_WIN64) // We don't link this in the NaCl 64 bit binary.

34 chrome::RegisterInternalDefaultPlugin();	33 chrome::RegisterInternalDefaultPlugin();

35 #endif

36 }	34 }

37	35

38 } // namespace chrome	36 } // namespace chrome

OLD	NEW