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

Unified Diff: mojo/shell/public/cpp/lib/shell_connection.cc

Issue 1686223002: Move InterfaceProvider into the shell::mojom namespace like the rest of the shell interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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 | « mojo/shell/public/cpp/lib/connection_impl.cc ('k') | mojo/shell/public/cpp/shell_connection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/public/cpp/lib/shell_connection.cc
diff --git a/mojo/shell/public/cpp/lib/shell_connection.cc b/mojo/shell/public/cpp/lib/shell_connection.cc
index 1f26780f14d271dc524c58220755a4e388b4c474..52150056c216ebf574c3ac9e7cd0d9a7c6c349fd 100644
--- a/mojo/shell/public/cpp/lib/shell_connection.cc
+++ b/mojo/shell/public/cpp/lib/shell_connection.cc
@@ -80,11 +80,11 @@ scoped_ptr<Connection> ShellConnection::Connect(ConnectParams* params) {
// filter here too?
std::set<std::string> allowed;
allowed.insert("*");
- InterfaceProviderPtr local_interfaces;
- InterfaceRequest<InterfaceProvider> local_request =
+ shell::mojom::InterfaceProviderPtr local_interfaces;
+ shell::mojom::InterfaceProviderRequest local_request =
GetProxy(&local_interfaces);
- InterfaceProviderPtr remote_interfaces;
- InterfaceRequest<InterfaceProvider> remote_request =
+ shell::mojom::InterfaceProviderPtr remote_interfaces;
+ shell::mojom::InterfaceProviderRequest remote_request =
GetProxy(&remote_interfaces);
scoped_ptr<internal::ConnectionImpl> registry(new internal::ConnectionImpl(
application_url, application_url,
@@ -124,8 +124,8 @@ void ShellConnection::Initialize(shell::mojom::ShellPtr shell,
void ShellConnection::AcceptConnection(
const String& requestor_url,
uint32_t requestor_id,
- InterfaceRequest<InterfaceProvider> local_interfaces,
- InterfaceProviderPtr remote_interfaces,
+ shell::mojom::InterfaceProviderRequest local_interfaces,
+ shell::mojom::InterfaceProviderPtr remote_interfaces,
Array<String> allowed_interfaces,
const String& url) {
scoped_ptr<Connection> registry(new internal::ConnectionImpl(
« no previous file with comments | « mojo/shell/public/cpp/lib/connection_impl.cc ('k') | mojo/shell/public/cpp/shell_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698