summaryrefslogtreecommitdiffstats
path: root/chrome/browser/metrics/metrics_service.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-20 07:51:54 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-20 07:51:54 +0000
commitf177ffd84b0f1b94de05fa0166520783cb5cddb9 (patch)
tree54f755e0de2d845cd2d8b481f08c528911ce62d2 /chrome/browser/metrics/metrics_service.cc
parent57c1b56f4ae39e8cb1cd805fb46653423d4e5456 (diff)
downloadchromium_src-f177ffd84b0f1b94de05fa0166520783cb5cddb9.zip
chromium_src-f177ffd84b0f1b94de05fa0166520783cb5cddb9.tar.gz
chromium_src-f177ffd84b0f1b94de05fa0166520783cb5cddb9.tar.bz2
Revert 118415 - Add a Content API around BrowserChildProcessHost, similar to what was done with ChildProcessHost. Now classes like PluginProcessHost don't derive from it, but instead use composition.
I've also moved the iterator class into its own file in the public directory. Since classes don't derive from BrowserChildProcessHost and so can't static_cast from it, I added a template helper that does this. BUG=98716 Review URL: https://chromiumcodereview.appspot.com/9150017 TBR=jam@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metrics/metrics_service.cc')
-rw-r--r--chrome/browser/metrics/metrics_service.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index c0cf20b..305c930 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -177,7 +177,6 @@
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
#include "content/browser/load_notification_details.h"
-#include "content/public/browser/child_process_data.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/plugin_service.h"
#include "content/public/browser/render_process_host.h"
@@ -197,7 +196,6 @@
using base::Time;
using content::BrowserThread;
-using content::ChildProcessData;
using content::PluginService;
// Check to see that we're being called on only one thread.
@@ -1337,7 +1335,7 @@ void MetricsService::LogChildProcessChange(
int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {
- content::Details<ChildProcessData> child_details(details);
+ content::Details<content::ChildProcessData> child_details(details);
const string16& child_name = child_details->name;
if (child_process_stats_buffer_.find(child_name) ==