chrome/browser/memory_details.cc - Issue 2965015: Attempt four at landing the "histogram.h removed from message_loop.h" patch.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/memory_details.cc

Issue 2965015: Attempt four at landing the "histogram.h removed from message_loop.h" patch. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: win build fixes Created 10 years, 5 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

« no previous file with comments | « chrome/browser/io_thread.h ('k') | chrome/browser/net/chrome_net_log.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 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/memory_details.h"	5 #include "chrome/browser/memory_details.h"

6	6

7 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

8 #include "base/file_version_info.h"	8 #include "base/file_version_info.h"

	9 #include "base/histogram.h"

9 #include "base/process_util.h"	10 #include "base/process_util.h"

10 #include "base/utf_string_conversions.h"	11 #include "base/utf_string_conversions.h"

11 #include "chrome/browser/browser_child_process_host.h"	12 #include "chrome/browser/browser_child_process_host.h"

12 #include "chrome/browser/chrome_thread.h"	13 #include "chrome/browser/chrome_thread.h"

13 #include "chrome/browser/renderer_host/backing_store_manager.h"	14 #include "chrome/browser/renderer_host/backing_store_manager.h"

14 #include "chrome/browser/renderer_host/render_process_host.h"	15 #include "chrome/browser/renderer_host/render_process_host.h"

15 #include "chrome/browser/renderer_host/render_view_host.h"	16 #include "chrome/browser/renderer_host/render_view_host.h"

16 #include "chrome/browser/tab_contents/navigation_entry.h"	17 #include "chrome/browser/tab_contents/navigation_entry.h"

17 #include "chrome/browser/tab_contents/tab_contents.h"	18 #include "chrome/browser/tab_contents/tab_contents.h"

18 #include "chrome/common/url_constants.h"	19 #include "chrome/common/url_constants.h"

(...skipping 209 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
228 UMA_HISTOGRAM_COUNTS_100("Memory.ProcessCount",	229 UMA_HISTOGRAM_COUNTS_100("Memory.ProcessCount",

229 static_cast<int>(browser.processes.size()));	230 static_cast<int>(browser.processes.size()));

230 UMA_HISTOGRAM_COUNTS_100("Memory.PluginProcessCount", plugin_count);	231 UMA_HISTOGRAM_COUNTS_100("Memory.PluginProcessCount", plugin_count);

231 UMA_HISTOGRAM_COUNTS_100("Memory.WorkerProcessCount", worker_count);	232 UMA_HISTOGRAM_COUNTS_100("Memory.WorkerProcessCount", worker_count);

232 // TODO(viettrungluu): Do we want separate counts for the other	233 // TODO(viettrungluu): Do we want separate counts for the other

233 // (platform-specific) process types?	234 // (platform-specific) process types?

234	235

235 int total_sample = static_cast<int>(aggregate_memory / 1000);	236 int total_sample = static_cast<int>(aggregate_memory / 1000);

236 UMA_HISTOGRAM_MEMORY_MB("Memory.Total", total_sample);	237 UMA_HISTOGRAM_MEMORY_MB("Memory.Total", total_sample);

237 }	238 }

OLD	NEW