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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2579233002: Merge MemoryCoordinator and MemoryCoordinatorImpl into one class (Closed)
Patch Set: addressed comments Created 4 years 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
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/dom_storage/dom_storage_context_wrapper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 574416b1f35907a9ace912186bcfb361796eb807..aed3789f7230625bd929d0c4a7decd3adfa30f0e 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -67,7 +67,7 @@
#include "content/browser/loader/resource_dispatcher_host_impl.h"
#include "content/browser/loader_delegate_impl.h"
#include "content/browser/media/media_internals.h"
-#include "content/browser/memory/memory_coordinator.h"
+#include "content/browser/memory/memory_coordinator_impl.h"
#include "content/browser/net/browser_online_state_observer.h"
#include "content/browser/renderer_host/media/media_stream_manager.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
@@ -868,7 +868,7 @@ int BrowserMainLoop::PreCreateThreads() {
InitializeMemoryManagementComponent();
if (base::FeatureList::IsEnabled(features::kMemoryCoordinator))
- MemoryCoordinator::GetInstance()->Start();
+ MemoryCoordinatorImpl::GetInstance()->Start();
#if BUILDFLAG(ENABLE_PLUGINS)
// Prior to any processing happening on the IO thread, we create the
@@ -1623,17 +1623,17 @@ void BrowserMainLoop::InitializeMemoryManagementComponent() {
// tied to the lifetime of the browser process.
base::MemoryCoordinatorProxy::GetInstance()->
SetGetCurrentMemoryStateCallback(base::Bind(
- &MemoryCoordinator::GetCurrentMemoryState,
- base::Unretained(MemoryCoordinator::GetInstance())));
+ &MemoryCoordinatorImpl::GetCurrentMemoryState,
+ base::Unretained(MemoryCoordinatorImpl::GetInstance())));
base::MemoryCoordinatorProxy::GetInstance()->
SetSetCurrentMemoryStateForTestingCallback(base::Bind(
- &MemoryCoordinator::SetCurrentMemoryStateForTesting,
- base::Unretained(MemoryCoordinator::GetInstance())));
+ &MemoryCoordinatorImpl::SetCurrentMemoryStateForTesting,
+ base::Unretained(MemoryCoordinatorImpl::GetInstance())));
if (memory_pressure_monitor_) {
memory_pressure_monitor_->SetDispatchCallback(
- base::Bind(&MemoryCoordinator::RecordMemoryPressure,
- base::Unretained(MemoryCoordinator::GetInstance())));
+ base::Bind(&MemoryCoordinatorImpl::RecordMemoryPressure,
+ base::Unretained(MemoryCoordinatorImpl::GetInstance())));
}
}
}
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/dom_storage/dom_storage_context_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698