Revert 270907 "Remove knowledge of nacl from content."

trunk/src/chrome/browser/task_manager/child_process_resource_provider.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/task_manager/child_process_resource_provider.h"
 
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string16.h"
@@ skipping 13 matching lines @@
 using content::BrowserThread;
 using content::WebContents;
 
 namespace task_manager {
 
 class ChildProcessResource : public Resource {
  public:
   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;
   virtual base::ProcessHandle GetProcess() const OVERRIDE;
   virtual int GetUniqueChildProcessId() const OVERRIDE;
   virtual Type GetType() const OVERRIDE;
   virtual bool SupportNetworkUsage() const OVERRIDE;
   virtual void SetSupportNetworkUsage() OVERRIDE;
 
   // Returns the pid of the child process.
   int process_id() const { return pid_; }
 
  private:
   // Returns a localized title for the child process.  For example, a plugin
   // process would be "Plug-in: Flash" when name is "Flash".
   base::string16 GetLocalizedTitle() const;
 
   int process_type_;
   base::string16 name_;
   base::ProcessHandle handle_;
   int pid_;
   int unique_process_id_;
+  int nacl_debug_stub_port_;
   mutable base::string16 title_;
   bool network_usage_support_;
 
   // The icon painted for the child processs.
   // TODO(jcampan): we should have plugin specific icons for well-known
   // plugins.
   static gfx::ImageSkia* default_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessResource);
 };
 
 gfx::ImageSkia* ChildProcessResource::default_icon_ = NULL;
 
 ChildProcessResource::ChildProcessResource(
     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.
   pid_ = base::GetProcId(handle);
   if (!default_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_icon_ = rb.GetImageSkiaNamed(IDR_PLUGINS_FAVICON);
     // TODO(jabdelmalek): use different icon for web workers.
   }
 }
 
 ChildProcessResource::~ChildProcessResource() {
 }
 
 // Resource methods:
+int ChildProcessResource::GetNaClDebugStubPort() const {
+  return nacl_debug_stub_port_;
+}
+
 base::string16 ChildProcessResource::GetTitle() const {
   if (title_.empty())
     title_ = GetLocalizedTitle();
 
   return title_;
 }
 
 base::string16 ChildProcessResource::GetProfileName() const {
   return base::string16();
 }
@@ skipping 195 matching lines @@
   delete resource;
 }
 
 void ChildProcessResourceProvider::AddToTaskManager(
     const content::ChildProcessData& child_process_data) {
   ChildProcessResource* resource =
       new ChildProcessResource(
           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);
 }
 
 // The ChildProcessData::Iterator has to be used from the IO thread.
 void ChildProcessResourceProvider::RetrieveChildProcessData() {
   std::vector<content::ChildProcessData> child_processes;
   for (BrowserChildProcessHostIterator iter; !iter.Done(); ++iter) {
     // Only add processes which are already started, since we need their handle.
@@ skipping 15 matching lines @@
 // This is called on the UI thread.
 void ChildProcessResourceProvider::ChildProcessDataRetreived(
     const std::vector<content::ChildProcessData>& child_processes) {
   for (size_t i = 0; i < child_processes.size(); ++i)
     AddToTaskManager(child_processes[i]);
 
   task_manager_->model()->NotifyDataReady();
 }
 
 }  // namespace task_manager