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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 6677064: Remove last dependencies on chrome\common from chrome\plugin. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 9 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.h ('k') | chrome/common/section_util_win.h » ('j') | 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/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #include "chrome/common/child_process_logging.h" 7 #include "chrome/common/child_process_logging.h"
8 #include "chrome/common/default_plugin.h"
9
10 #if defined(OS_MACOSX)
11 #include "base/mac/mac_util.h"
12 #include "base/mac/scoped_cftyperef.h"
13 #include "base/sys_string_conversions.h"
14 #include "grit/chromium_strings.h"
15 #include "ui/base/l10n/l10n_util.h"
16 #endif
8 17
9 namespace chrome { 18 namespace chrome {
10 19
11 void ChromeContentClient::SetActiveURL(const GURL& url) { 20 void ChromeContentClient::SetActiveURL(const GURL& url) {
12 child_process_logging::SetActiveURL(url); 21 child_process_logging::SetActiveURL(url);
13 } 22 }
14 23
15 void ChromeContentClient::SetGpuInfo(const GPUInfo& gpu_info) { 24 void ChromeContentClient::SetGpuInfo(const GPUInfo& gpu_info) {
16 child_process_logging::SetGpuInfo(gpu_info); 25 child_process_logging::SetGpuInfo(gpu_info);
17 } 26 }
18 27
19 void ChromeContentClient::PluginProcessStarted() { 28 void ChromeContentClient::PluginProcessStarted(const string16& plugin_name) {
29 #if defined(OS_MACOSX)
30 base::mac::ScopedCFTypeRef<CFStringRef> cf_plugin_name(
31 base::SysUTF16ToCFStringRef(plugin_name));
32 base::mac::ScopedCFTypeRef<CFStringRef> app_name(
33 base::SysUTF16ToCFStringRef(
34 l10n_util::GetStringUTF16(IDS_SHORT_PLUGIN_APP_NAME)));
35 base::mac::ScopedCFTypeRef<CFStringRef> process_name(
36 CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%@ (%@)"),
37 cf_plugin_name.get(), app_name.get()));
38 base::mac::SetProcessName(process_name);
39 #endif
40
41 chrome::RegisterInternalDefaultPlugin();
20 } 42 }
21 43
22 } // namespace chrome 44 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | chrome/common/section_util_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698