chrome/plugin/chrome_content_plugin_client.cc - Issue 8493026: Revert r108760 / reland r108744, r108753 w/ fix

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

Issue 8493026: Revert r108760 / reland r108744, r108753 w/ fix (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rename plugin list accessor to plugin_list() Created 9 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 unified diff | Download patch | Annotate | Revision Log

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/plugin/chrome_content_plugin_client.h"	5 #include "chrome/plugin/chrome_content_plugin_client.h"

6	6

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

8

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

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

11 #include "base/mac/scoped_cftyperef.h"	9 #include "base/mac/scoped_cftyperef.h"

12 #include "base/sys_string_conversions.h"	10 #include "base/sys_string_conversions.h"

13 #include "grit/chromium_strings.h"	11 #include "grit/chromium_strings.h"

14 #include "ui/base/l10n/l10n_util.h"	12 #include "ui/base/l10n/l10n_util.h"

15 #endif	13 #endif

16	14

17 namespace chrome {	15 namespace chrome {

18	16

19 void ChromeContentPluginClient::PluginProcessStarted(	17 void ChromeContentPluginClient::PluginProcessStarted(

20 const string16& plugin_name) {	18 const string16& plugin_name) {

21 #if defined(OS_MACOSX)	19 #if defined(OS_MACOSX)

22 base::mac::ScopedCFTypeRef<CFStringRef> cf_plugin_name(	20 base::mac::ScopedCFTypeRef<CFStringRef> cf_plugin_name(

23 base::SysUTF16ToCFStringRef(plugin_name));	21 base::SysUTF16ToCFStringRef(plugin_name));

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

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

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

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

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

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

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

31 #endif	29 #endif

32

33 chrome::RegisterInternalDefaultPlugin();

34 }	30 }

35	31

36 } // namespace chrome	32 } // namespace chrome

OLD	NEW

« no previous file with comments | « chrome/common/default_plugin.cc ('k') | content/browser/plugin_service.h » ('j') | no next file with comments »