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

Side by Side Diff: content/browser/frame_host/frame_mojo_shell.cc

Issue 1737933002: mojo leveldb: Get profile and leveldb connected to DOMStorageContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge tot Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/frame_mojo_shell.h" 5 #include "content/browser/frame_host/frame_mojo_shell.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "content/browser/mojo/mojo_shell_context.h" 10 #include "content/browser/mojo/mojo_shell_context.h"
11 #include "content/common/mojo/service_registry_impl.h" 11 #include "content/common/mojo/service_registry_impl.h"
12 #include "content/public/browser/browser_context.h"
12 #include "content/public/browser/content_browser_client.h" 13 #include "content/public/browser/content_browser_client.h"
13 #include "content/public/browser/render_frame_host.h" 14 #include "content/public/browser/render_frame_host.h"
15 #include "content/public/browser/render_process_host.h"
14 #include "content/public/browser/site_instance.h" 16 #include "content/public/browser/site_instance.h"
15 #include "content/public/common/content_client.h" 17 #include "content/public/common/content_client.h"
16 #include "mojo/common/url_type_converters.h" 18 #include "mojo/common/url_type_converters.h"
17 19
18 #if defined(OS_ANDROID) && defined(ENABLE_MOJO_CDM) 20 #if defined(OS_ANDROID) && defined(ENABLE_MOJO_CDM)
19 #include "content/browser/media/android/provision_fetcher_impl.h" 21 #include "content/browser/media/android/provision_fetcher_impl.h"
20 #endif 22 #endif
21 23
22 namespace content { 24 namespace content {
23 25
(...skipping 22 matching lines...) Expand all
46 48
47 // TODO(xhwang): Currently no callers are exposing |exposed_services|. So we 49 // TODO(xhwang): Currently no callers are exposing |exposed_services|. So we
48 // drop it and replace it with services we provide in the browser. In the 50 // drop it and replace it with services we provide in the browser. In the
49 // future we may need to support both. 51 // future we may need to support both.
50 void FrameMojoShell::Connect( 52 void FrameMojoShell::Connect(
51 mojo::shell::mojom::IdentityPtr target, 53 mojo::shell::mojom::IdentityPtr target,
52 mojo::shell::mojom::InterfaceProviderRequest services, 54 mojo::shell::mojom::InterfaceProviderRequest services,
53 mojo::shell::mojom::InterfaceProviderPtr /* exposed_services */, 55 mojo::shell::mojom::InterfaceProviderPtr /* exposed_services */,
54 mojo::shell::mojom::ClientProcessConnectionPtr client_process_connection, 56 mojo::shell::mojom::ClientProcessConnectionPtr client_process_connection,
55 const mojo::shell::mojom::Connector::ConnectCallback& callback) { 57 const mojo::shell::mojom::Connector::ConnectCallback& callback) {
56 // TODO(beng): user_id is dropped on the floor right now. Figure out what to
57 // do with it.
58 mojo::shell::mojom::InterfaceProviderPtr frame_services; 58 mojo::shell::mojom::InterfaceProviderPtr frame_services;
59 service_provider_bindings_.AddBinding(GetServiceRegistry(), 59 service_provider_bindings_.AddBinding(GetServiceRegistry(),
60 GetProxy(&frame_services)); 60 GetProxy(&frame_services));
61 61 std::string mojo_user_id = BrowserContext::GetMojoUserIdFor(
62 frame_host_->GetProcess()->GetBrowserContext());
62 MojoShellContext::ConnectToApplication( 63 MojoShellContext::ConnectToApplication(
63 target->name, 64 mojo_user_id, target->name,
64 frame_host_->GetSiteInstance()->GetSiteURL().spec(), std::move(services), 65 frame_host_->GetSiteInstance()->GetSiteURL().spec(), std::move(services),
65 std::move(frame_services), callback); 66 std::move(frame_services), callback);
66 } 67 }
67 68
68 void FrameMojoShell::Clone(mojo::shell::mojom::ConnectorRequest request) { 69 void FrameMojoShell::Clone(mojo::shell::mojom::ConnectorRequest request) {
69 connectors_.AddBinding(this, std::move(request)); 70 connectors_.AddBinding(this, std::move(request));
70 } 71 }
71 72
72 ServiceRegistryImpl* FrameMojoShell::GetServiceRegistry() { 73 ServiceRegistryImpl* FrameMojoShell::GetServiceRegistry() {
73 if (!service_registry_) { 74 if (!service_registry_) {
74 service_registry_.reset(new ServiceRegistryImpl()); 75 service_registry_.reset(new ServiceRegistryImpl());
75 76
76 // TODO(rockot/xhwang): Currently all applications connected share the same 77 // TODO(rockot/xhwang): Currently all applications connected share the same
77 // set of services registered in the |registry|. We may want to provide 78 // set of services registered in the |registry|. We may want to provide
78 // different services for different apps for better isolation. 79 // different services for different apps for better isolation.
79 RegisterFrameMojoShellServices(service_registry_.get(), frame_host_); 80 RegisterFrameMojoShellServices(service_registry_.get(), frame_host_);
80 GetContentClient()->browser()->RegisterFrameMojoShellServices( 81 GetContentClient()->browser()->RegisterFrameMojoShellServices(
81 service_registry_.get(), frame_host_); 82 service_registry_.get(), frame_host_);
82 } 83 }
83 84
84 return service_registry_.get(); 85 return service_registry_.get();
85 } 86 }
86 87
87 } // namespace content 88 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698