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

Unified Diff: content/browser/service_worker/embedded_worker_instance.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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: content/browser/service_worker/embedded_worker_instance.cc
diff --git a/content/browser/service_worker/embedded_worker_instance.cc b/content/browser/service_worker/embedded_worker_instance.cc
index 49b9b913be9fb2c88ad0c0bfb847c856796a5d32..451a612d3ce6c8c4c0db474cdd3931c3fa0e2a2f 100644
--- a/content/browser/service_worker/embedded_worker_instance.cc
+++ b/content/browser/service_worker/embedded_worker_instance.cc
@@ -87,8 +87,8 @@ void RegisterToWorkerDevToolsManagerOnUI(
void SetupMojoOnUIThread(
int process_id,
int thread_id,
- mojo::shell::mojom::InterfaceProviderRequest services,
- mojo::shell::mojom::InterfaceProviderPtrInfo exposed_services) {
+ shell::mojom::InterfaceProviderRequest services,
+ shell::mojom::InterfaceProviderPtrInfo exposed_services) {
RenderProcessHost* rph = RenderProcessHost::FromID(process_id);
// |rph| or its ServiceRegistry may be NULL in unit tests.
if (!rph || !rph->GetServiceRegistry())
@@ -595,11 +595,10 @@ void EmbeddedWorkerInstance::OnThreadStarted(int thread_id) {
thread_id_ = thread_id;
FOR_EACH_OBSERVER(Listener, listener_list_, OnThreadStarted());
- mojo::shell::mojom::InterfaceProviderPtr exposed_services;
+ shell::mojom::InterfaceProviderPtr exposed_services;
service_registry_->Bind(GetProxy(&exposed_services));
- mojo::shell::mojom::InterfaceProviderPtr services;
- mojo::shell::mojom::InterfaceProviderRequest services_request =
- GetProxy(&services);
+ shell::mojom::InterfaceProviderPtr services;
+ shell::mojom::InterfaceProviderRequest services_request = GetProxy(&services);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(SetupMojoOnUIThread, process_id(), thread_id_,
« no previous file with comments | « content/browser/mojo_shell_browsertest.cc ('k') | content/browser/service_worker/embedded_worker_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698