summaryrefslogtreecommitdiffstats
path: root/chrome/browser/memory_details.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 01:14:42 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 01:14:42 +0000
commit0b07be45881306b32eab0d87f7d55ec3e84cd676 (patch)
tree914217cc11befe8e1dfe8b6f571ca8dd15a734bd /chrome/browser/memory_details.cc
parent808d95b86f71910d1d3da1b16483b8fe24ab8980 (diff)
downloadchromium_src-0b07be45881306b32eab0d87f7d55ec3e84cd676.zip
chromium_src-0b07be45881306b32eab0d87f7d55ec3e84cd676.tar.gz
chromium_src-0b07be45881306b32eab0d87f7d55ec3e84cd676.tar.bz2
Get rid of BackingStore usage in chrome. I added methods on RenderWidgetHost to copy data out of the backing store to satisfy the existing users.
Note that the ThumbnailGenerator test turned out to be testing a feature that has since been removed! So I removed that test and the supporting code. BUG=98716 Review URL: https://chromiumcodereview.appspot.com/9515009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/memory_details.cc')
-rw-r--r--chrome/browser/memory_details.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index ea3985c..a44f50a 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -16,10 +16,9 @@
#include "chrome/common/chrome_view_type.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/url_constants.h"
+#include "content/browser/renderer_host/render_view_host.h"
#include "content/public/browser/browser_child_process_host_iterator.h"
#include "content/public/browser/child_process_data.h"
-#include "content/browser/renderer_host/backing_store_manager.h"
-#include "content/browser/renderer_host/render_view_host.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
@@ -415,7 +414,7 @@ void MemoryDetails::UpdateHistograms() {
}
}
UMA_HISTOGRAM_MEMORY_KB("Memory.BackingStore",
- BackingStoreManager::MemorySize() / 1024);
+ RenderWidgetHost::BackingStoreMemorySize() / 1024);
UMA_HISTOGRAM_COUNTS_100("Memory.ProcessCount",
static_cast<int>(browser.processes.size()));