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

Unified Diff: content/browser/browser_child_process_host.cc

Issue 8760011: Move the ProcessType enum out to its own file. This is in preparation for getting rid of ChildPro... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 9 years, 1 month 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 | « content/browser/browser_child_process_host.h ('k') | content/browser/debugger/worker_devtools_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_child_process_host.cc
===================================================================
--- content/browser/browser_child_process_host.cc (revision 112315)
+++ content/browser/browser_child_process_host.cc (working copy)
@@ -60,7 +60,7 @@
} // namespace
BrowserChildProcessHost::BrowserChildProcessHost(
- ChildProcessInfo::ProcessType type)
+ content::ProcessType type)
: ChildProcessInfo(type, -1),
ALLOW_THIS_IN_INITIALIZER_LIST(client_(this)),
#if !defined(OS_WIN)
@@ -157,10 +157,12 @@
// Report that this child process crashed.
Notify(content::NOTIFICATION_CHILD_PROCESS_CRASHED);
UMA_HISTOGRAM_ENUMERATION("ChildProcess.Crashed",
- this->type(), MAX_PROCESS);
+ this->type(),
+ content::PROCESS_TYPE_MAX);
if (disconnect_was_alive_) {
UMA_HISTOGRAM_ENUMERATION("ChildProcess.CrashedWasAlive",
- this->type(), MAX_PROCESS);
+ this->type(),
+ content::PROCESS_TYPE_MAX);
}
break;
}
@@ -169,10 +171,12 @@
// Report that this child process was killed.
Notify(content::NOTIFICATION_CHILD_PROCESS_WAS_KILLED);
UMA_HISTOGRAM_ENUMERATION("ChildProcess.Killed",
- this->type(), MAX_PROCESS);
+ this->type(),
+ content::PROCESS_TYPE_MAX);
if (disconnect_was_alive_) {
UMA_HISTOGRAM_ENUMERATION("ChildProcess.KilledWasAlive",
- this->type(), MAX_PROCESS);
+ this->type(),
+ content::PROCESS_TYPE_MAX);
}
break;
}
@@ -181,7 +185,8 @@
// code.
if (disconnect_was_alive_) {
UMA_HISTOGRAM_ENUMERATION("ChildProcess.DisconnectedAlive",
- this->type(), MAX_PROCESS);
+ this->type(),
+ content::PROCESS_TYPE_MAX);
break;
}
disconnect_was_alive_ = true;
@@ -206,7 +211,8 @@
break;
}
UMA_HISTOGRAM_ENUMERATION("ChildProcess.Disconnected",
- this->type(), MAX_PROCESS);
+ this->type(),
+ content::PROCESS_TYPE_MAX);
// Notify in the main loop of the disconnection.
Notify(content::NOTIFICATION_CHILD_PROCESS_HOST_DISCONNECTED);
OnChildDied();
@@ -248,13 +254,13 @@
}
BrowserChildProcessHost::Iterator::Iterator()
- : all_(true), type_(UNKNOWN_PROCESS) {
+ : all_(true), type_(content::PROCESS_TYPE_UNKNOWN) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)) <<
"ChildProcessInfo::Iterator must be used on the IO thread.";
iterator_ = g_child_process_list.Get().begin();
}
-BrowserChildProcessHost::Iterator::Iterator(ChildProcessInfo::ProcessType type)
+BrowserChildProcessHost::Iterator::Iterator(content::ProcessType type)
: all_(false), type_(type) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)) <<
"ChildProcessInfo::Iterator must be used on the IO thread.";
« no previous file with comments | « content/browser/browser_child_process_host.h ('k') | content/browser/debugger/worker_devtools_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698