diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 05:16:13 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 05:16:13 +0000 |
| commit | f3b3576935e25d8d4e6c244740a06a36b9dc9f8e (patch) | |
| tree | a5e44168dc6631d47c58e1b9c6008e236581bcbe /content/browser/histogram_controller.cc | |
| parent | 0c472954a32a68e6d6cc7be6eb53b6b9e99b66d6 (diff) | |
| download | chromium_src-f3b3576935e25d8d4e6c244740a06a36b9dc9f8e.zip chromium_src-f3b3576935e25d8d4e6c244740a06a36b9dc9f8e.tar.gz chromium_src-f3b3576935e25d8d4e6c244740a06a36b9dc9f8e.tar.bz2 | |
Split the ProcessType enum into process types that content knows about (which will remain in src\content) and those that are for chrome (which moved to src\chrome). This way we won't get any more layering violations where nacl code is in content.
Also move the NaCl command line switches to chrome.
BUG=191682
Review URL: https://codereview.chromium.org/12662019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/histogram_controller.cc')
| -rw-r--r-- | content/browser/histogram_controller.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/browser/histogram_controller.cc b/content/browser/histogram_controller.cc index 228e67f..54f760b 100644 --- a/content/browser/histogram_controller.cc +++ b/content/browser/histogram_controller.cc @@ -12,6 +12,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/render_process_host.h" +#include "content/public/common/process_type.h" namespace content { @@ -71,7 +72,7 @@ void HistogramController::GetHistogramDataFromChildProcesses( int pending_processes = 0; for (BrowserChildProcessHostIterator iter; !iter.Done(); ++iter) { - ProcessType type = iter.GetData().type; + int type = iter.GetData().process_type; if (type != PROCESS_TYPE_PLUGIN && type != PROCESS_TYPE_GPU) continue; ++pending_processes; |