Add support for showing NaCl 64-bit processes in Chrome's task manager and about:memory page

chrome/browser/memory_details_win.cc

 // Copyright (c) 2006-2008 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/memory_details.h"
 #include <psapi.h>
 
 #include "app/l10n_util.h"
 #include "base/file_version_info.h"
 #include "base/string_util.h"
 #include "chrome/browser/child_process_host.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/renderer_host/backing_store_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
 
 // Known browsers which we collect details for.
 enum {
   CHROME_BROWSER = 0,
+  CHROME_NACL_PROCESS,
   IE_BROWSER,
   FIREFOX_BROWSER,
   OPERA_BROWSER,
   SAFARI_BROWSER,
   IE_64BIT_BROWSER,
   KONQUEROR_BROWSER,
   MAX_BROWSERS
 } BrowserProcess;
 
 // Template of static data we use for finding browser process information.
 // These entries must match the ordering for MemoryDetails::BrowserProcess.
 static ProcessData g_process_template[MAX_BROWSERS];
 
 MemoryDetails::MemoryDetails() {
   static const std::wstring google_browser_name =
       l10n_util::GetString(IDS_PRODUCT_NAME);
   ProcessData g_process_template[MAX_BROWSERS] = {
     { google_browser_name.c_str(), L"chrome.exe", },
+    { google_browser_name.c_str(), L"nacl64.exe", },
     { L"IE", L"iexplore.exe", },
     { L"Firefox", L"firefox.exe", },
     { L"Opera", L"opera.exe", },
     { L"Safari", L"safari.exe", },
     { L"IE (64bit)", L"iexplore.exe", },
     { L"Konqueror", L"konqueror.exe", },
   };
 
   for (int index = 0; index < arraysize(g_process_template); ++index) {
     ProcessData process;
@@ skipping 59 matching lines @@
       else
         info.type = ChildProcessInfo::UNKNOWN_PROCESS;
 
       scoped_ptr<base::ProcessMetrics> metrics;
       metrics.reset(base::ProcessMetrics::CreateProcessMetrics(handle));
       metrics->GetCommittedKBytes(&info.committed);
       metrics->GetWorkingSetKBytes(&info.working_set);
 
       // Get Version Information.
       TCHAR name[MAX_PATH];
-      if (index2 == CHROME_BROWSER) {
+      if (index2 == CHROME_BROWSER || index2 == CHROME_NACL_PROCESS) {
         scoped_ptr<FileVersionInfo> version_info(
             FileVersionInfo::CreateFileVersionInfoForCurrentModule());
         if (version_info != NULL)
           info.version = version_info->file_version();
         // Check if this is one of the child processes whose data we collected
         // on the IO thread, and if so copy over that data.
         for (size_t child = 0; child < child_info.size(); child++) {
           if (child_info[child].pid != info.pid)
             continue;
           info.titles = child_info[child].titles;
           info.type = child_info[child].type;
           break;
         }
       } else if (GetModuleFileNameEx(handle, NULL, name, MAX_PATH - 1)) {
         std::wstring str_name(name);
         scoped_ptr<FileVersionInfo> version_info(
             FileVersionInfo::CreateFileVersionInfo(str_name));
         if (version_info != NULL) {
           info.version = version_info->product_version();
           info.product_name = version_info->product_name();
         }
       }
 
       // Add the process info to our list.
-      process_data_[index2].processes.push_back(info);
+      if (index2 == CHROME_NACL_PROCESS) {
+        // Add NaCl processes to Chrome's list
+        process_data_[CHROME_BROWSER].processes.push_back(info);
+      } else {
+        process_data_[index2].processes.push_back(info);
+      }
       break;
     }
   } while (::Process32Next(snapshot, &process_entry));
 
   // Finally return to the browser thread.
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(this, &MemoryDetails::CollectChildInfoOnUIThread));
 }