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

Unified Diff: chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc
diff --git a/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc b/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc
index 50b65a63844c892b7b492ae464f20c5558b148ec..67c083800373bcf751831741d56cdf5c1432649c 100644
--- a/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc
+++ b/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc
@@ -82,7 +82,7 @@ base::DictionaryValue* FindProcessFromPid(base::ListValue* processes,
void GetAllWebContents(std::set<content::WebContents*>* web_contents) {
// Add all the existing WebContentses.
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
for (TabModelList::const_iterator iter = TabModelList::begin();
iter != TabModelList::end(); ++iter) {
TabModel* model = *iter;
@@ -223,7 +223,7 @@ MemoryInternalsProxy::~MemoryInternalsProxy() {}
void MemoryInternalsProxy::RequestRendererDetails() {
renderer_details_->Clear();
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
for (TabModelList::const_iterator iter = TabModelList::begin();
iter != TabModelList::end(); ++iter) {
TabModel* model = *iter;

Powered by Google App Engine
This is Rietveld 408576698