Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: chrome/plugin/chrome_content_plugin_client.cc

Issue 45253002: Do not use set process names in the Activity Monitor, using Process Manager functions in the proces… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: grd fix Created 7 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
« no previous file with comments | « chrome/plugin/chrome_content_plugin_client.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #if defined(ENABLE_REMOTING) 7 #if defined(ENABLE_REMOTING)
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "content/public/common/content_paths.h" 10 #include "content/public/common/content_paths.h"
11 #include "media/base/media.h" 11 #include "media/base/media.h"
12 #if defined(OS_WIN) 12 #if defined(OS_WIN)
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/native_library.h" 14 #include "base/native_library.h"
15 #elif defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS) 15 #elif defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS)
16 #include "crypto/nss_util.h" 16 #include "crypto/nss_util.h"
17 #endif 17 #endif
18 #endif 18 #endif
19 19
20 #if defined(OS_MACOSX)
21 #include "base/mac/mac_util.h"
22 #include "base/mac/scoped_cftyperef.h"
23 #include "base/strings/sys_string_conversions.h"
24 #include "grit/chromium_strings.h"
25 #include "ui/base/l10n/l10n_util.h"
26 #endif
27
28 namespace chrome { 20 namespace chrome {
29 21
30 void ChromeContentPluginClient::PreSandboxInitialization() { 22 void ChromeContentPluginClient::PreSandboxInitialization() {
31 #if defined(ENABLE_REMOTING) 23 #if defined(ENABLE_REMOTING)
32 24
33 // Load crypto libraries for the Chromoting client plugin. 25 // Load crypto libraries for the Chromoting client plugin.
34 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS) 26 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS)
35 // On platforms where we use system NSS libraries, the .so's must be loaded 27 // On platforms where we use system NSS libraries, the .so's must be loaded
36 // before the sandbox is initialized. 28 // before the sandbox is initialized.
37 crypto::ForceNSSNoDBInit(); 29 crypto::ForceNSSNoDBInit();
38 crypto::EnsureNSSInit(); 30 crypto::EnsureNSSInit();
39 #elif defined(OS_WIN) 31 #elif defined(OS_WIN)
40 // crypt32.dll is used to decode X509 certificates for Chromoting. 32 // crypt32.dll is used to decode X509 certificates for Chromoting.
41 std::string error; 33 std::string error;
42 if (base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error) == NULL) 34 if (base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error) == NULL)
43 LOG(ERROR) << "Failed to load crypto32.dll: " << error; 35 LOG(ERROR) << "Failed to load crypto32.dll: " << error;
44 #endif // defined(OS_WIN) 36 #endif // defined(OS_WIN)
45 37
46 // Load media libraries for the Chromoting client plugin. 38 // Load media libraries for the Chromoting client plugin.
47 base::FilePath media_path; 39 base::FilePath media_path;
48 PathService::Get(content::DIR_MEDIA_LIBS, &media_path); 40 PathService::Get(content::DIR_MEDIA_LIBS, &media_path);
49 if (!media_path.empty()) 41 if (!media_path.empty())
50 media::InitializeMediaLibrary(media_path); 42 media::InitializeMediaLibrary(media_path);
51 43
52 #endif // defined(ENABLE_REMOTING) 44 #endif // defined(ENABLE_REMOTING)
53 } 45 }
54 46
55 void ChromeContentPluginClient::PluginProcessStarted(
56 const string16& plugin_name) {
57 #if defined(OS_MACOSX)
58 base::ScopedCFTypeRef<CFStringRef> cf_plugin_name(
59 base::SysUTF16ToCFStringRef(plugin_name));
60 base::ScopedCFTypeRef<CFStringRef> app_name(base::SysUTF16ToCFStringRef(
61 l10n_util::GetStringUTF16(IDS_SHORT_PLUGIN_APP_NAME)));
62 base::ScopedCFTypeRef<CFStringRef> process_name(
63 CFStringCreateWithFormat(kCFAllocatorDefault,
64 NULL,
65 CFSTR("%@ (%@)"),
66 cf_plugin_name.get(),
67 app_name.get()));
68 base::mac::SetProcessName(process_name);
69 #endif
70 }
71
72 } // namespace chrome 47 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/plugin/chrome_content_plugin_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698