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

Unified Diff: trunk/src/chrome/browser/task_manager/child_process_resource_provider.cc

Issue 290633006: Revert 270907 "Remove knowledge of nacl from content." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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
« no previous file with comments | « no previous file | trunk/src/chrome/browser/task_manager/resource_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/task_manager/child_process_resource_provider.cc
===================================================================
--- trunk/src/chrome/browser/task_manager/child_process_resource_provider.cc (revision 270923)
+++ trunk/src/chrome/browser/task_manager/child_process_resource_provider.cc (working copy)
@@ -31,10 +31,12 @@
ChildProcessResource(int process_type,
const base::string16& name,
base::ProcessHandle handle,
- int unique_process_id);
+ int unique_process_id,
+ int nacl_debug_stub_port);
virtual ~ChildProcessResource();
// Resource methods:
+ virtual int GetNaClDebugStubPort() const OVERRIDE;
virtual base::string16 GetTitle() const OVERRIDE;
virtual base::string16 GetProfileName() const OVERRIDE;
virtual gfx::ImageSkia GetIcon() const OVERRIDE;
@@ -57,6 +59,7 @@
base::ProcessHandle handle_;
int pid_;
int unique_process_id_;
+ int nacl_debug_stub_port_;
mutable base::string16 title_;
bool network_usage_support_;
@@ -74,11 +77,13 @@
int process_type,
const base::string16& name,
base::ProcessHandle handle,
- int unique_process_id)
+ int unique_process_id,
+ int nacl_debug_stub_port)
: process_type_(process_type),
name_(name),
handle_(handle),
unique_process_id_(unique_process_id),
+ nacl_debug_stub_port_(nacl_debug_stub_port),
network_usage_support_(false) {
// We cache the process id because it's not cheap to calculate, and it won't
// be available when we get the plugin disconnected notification.
@@ -94,6 +99,10 @@
}
// Resource methods:
+int ChildProcessResource::GetNaClDebugStubPort() const {
+ return nacl_debug_stub_port_;
+}
+
base::string16 ChildProcessResource::GetTitle() const {
if (title_.empty())
title_ = GetLocalizedTitle();
@@ -309,7 +318,8 @@
child_process_data.process_type,
child_process_data.name,
child_process_data.handle,
- child_process_data.id);
+ child_process_data.id,
+ child_process_data.nacl_debug_stub_port);
resources_[child_process_data.handle] = resource;
pid_to_resources_[resource->process_id()] = resource;
task_manager_->AddResource(resource);
« no previous file with comments | « no previous file | trunk/src/chrome/browser/task_manager/resource_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698