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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2690143004: NOCOMMIT: Rebased https://codereview.chromium.org/2696503004 on service rename
Patch Set: Rebase Created 3 years, 10 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
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | components/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 9b0b2bbac62e8c23b2bf8926361a37cfd785ac39..30c0697488e2c927eb1465d0ae764f4e33049514 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -196,6 +196,7 @@
#include "printing/features/features.h"
#include "services/image_decoder/public/interfaces/constants.mojom.h"
#include "services/preferences/public/interfaces/preferences.mojom.h"
+#include "services/resource_coordinator/memory/coordinator/coordinator_impl.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#include "services/service_manager/public/cpp/service.h"
@@ -3001,6 +3002,12 @@ void ChromeContentBrowserClient::ExposeInterfacesToRenderer(
base::Bind(&metrics::LeakDetectorRemoteController::Create),
ui_task_runner);
#endif
+
+ BrowserThread::PostTask(
+ BrowserThread::UI, FROM_HERE,
+ base::Bind(
+ &ChromeContentBrowserClient::ExposeMemoryInstrumentationOnUIThread,
+ base::Unretained(this), base::Unretained(registry)));
}
void ChromeContentBrowserClient::ExposeInterfacesToMediaService(
@@ -3097,6 +3104,24 @@ void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess(
registry->AddInterface(
base::Bind(&metrics::CallStackProfileCollector::Create,
metrics::CallStackProfileParams::GPU_PROCESS));
+
+ BrowserThread::PostTask(
+ BrowserThread::UI, FROM_HERE,
+ base::Bind(
+ &ChromeContentBrowserClient::ExposeMemoryInstrumentationOnUIThread,
+ base::Unretained(this), base::Unretained(registry)));
+}
+
+void ChromeContentBrowserClient::ExposeMemoryInstrumentationOnUIThread(
+ service_manager::InterfaceRegistry* registry) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ registry->AddInterface(
+ base::Bind(
+ &memory_instrumentation::CoordinatorImpl::BindCoordinatorRequest,
+ base::Unretained(
+ memory_instrumentation::CoordinatorImpl::GetInstance())),
+ content::BrowserThread::GetTaskRunnerForThread(
+ content::BrowserThread::UI));
}
void ChromeContentBrowserClient::RegisterInProcessServices(
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | components/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698