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

Side by Side Diff: chrome/browser/automation/automation_provider_observers.cc

Issue 12662019: Split the ProcessType enum into process types that content knows about (which will remain in src\co… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/automation/automation_provider_observers.h" 5 #include "chrome/browser/automation/automation_provider_observers.h"
6 6
7 #include <deque> 7 #include <deque>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 2540 matching lines...) Expand 10 before | Expand all | Expand 10 after
2551 2551
2552 proc_data->SetString("version", iterator->version); 2552 proc_data->SetString("version", iterator->version);
2553 proc_data->SetString("product_name", iterator->product_name); 2553 proc_data->SetString("product_name", iterator->product_name);
2554 proc_data->SetInteger("num_processes", iterator->num_processes); 2554 proc_data->SetInteger("num_processes", iterator->num_processes);
2555 proc_data->SetBoolean("is_diagnostics", iterator->is_diagnostics); 2555 proc_data->SetBoolean("is_diagnostics", iterator->is_diagnostics);
2556 2556
2557 // Process type, if this is a child process of Chrome (e.g., 'plugin'). 2557 // Process type, if this is a child process of Chrome (e.g., 'plugin').
2558 std::string process_type = "Unknown"; 2558 std::string process_type = "Unknown";
2559 // The following condition avoids a DCHECK in debug builds when the 2559 // The following condition avoids a DCHECK in debug builds when the
2560 // process type passed to |GetTypeNameInEnglish| is unknown. 2560 // process type passed to |GetTypeNameInEnglish| is unknown.
2561 if (iterator->type != content::PROCESS_TYPE_UNKNOWN) 2561 if (iterator->process_type != content::PROCESS_TYPE_UNKNOWN) {
2562 process_type = content::GetProcessTypeNameInEnglish(iterator->type); 2562 process_type =
2563 content::GetProcessTypeNameInEnglish(iterator->process_type);
2564 }
2563 proc_data->SetString("child_process_type", process_type); 2565 proc_data->SetString("child_process_type", process_type);
2564 2566
2565 // Renderer type, if this is a renderer process. 2567 // Renderer type, if this is a renderer process.
2566 std::string renderer_type = "Unknown"; 2568 std::string renderer_type = "Unknown";
2567 if (iterator->renderer_type != 2569 if (iterator->renderer_type !=
2568 ProcessMemoryInformation::RENDERER_UNKNOWN) { 2570 ProcessMemoryInformation::RENDERER_UNKNOWN) {
2569 renderer_type = ProcessMemoryInformation::GetRendererTypeNameInEnglish( 2571 renderer_type = ProcessMemoryInformation::GetRendererTypeNameInEnglish(
2570 iterator->renderer_type); 2572 iterator->renderer_type);
2571 } 2573 }
2572 proc_data->SetString("renderer_type", renderer_type); 2574 proc_data->SetString("renderer_type", renderer_type);
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
2847 if (automation_) { 2849 if (automation_) {
2848 AutomationJSONReply(automation_, reply_message_.release()) 2850 AutomationJSONReply(automation_, reply_message_.release())
2849 .SendSuccess(NULL); 2851 .SendSuccess(NULL);
2850 } 2852 }
2851 delete this; 2853 delete this;
2852 } 2854 }
2853 } else { 2855 } else {
2854 NOTREACHED(); 2856 NOTREACHED();
2855 } 2857 }
2856 } 2858 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698