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

Unified Diff: mojo/shell/public/cpp/lib/connection_impl.h

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/application_test_base.cc ('k') | mojo/shell/public/cpp/lib/connection_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/public/cpp/lib/connection_impl.h
diff --git a/mojo/shell/public/cpp/lib/connection_impl.h b/mojo/shell/public/cpp/lib/connection_impl.h
index ec52d9e9e621897b9472dd53fec338f7915b6e93..86ca3a73c4dfbee3f1585b1e7e150cb7c267f56c 100644
--- a/mojo/shell/public/cpp/lib/connection_impl.h
+++ b/mojo/shell/public/cpp/lib/connection_impl.h
@@ -21,7 +21,8 @@ namespace internal {
// A ConnectionImpl represents each half of a connection between two
// applications, allowing customization of which interfaces are published to the
// other.
-class ConnectionImpl : public Connection, public InterfaceProvider {
+class ConnectionImpl : public Connection,
+ public shell::mojom::InterfaceProvider {
public:
class TestApi {
public:
@@ -48,8 +49,8 @@ class ConnectionImpl : public Connection, public InterfaceProvider {
ConnectionImpl(const std::string& connection_url,
const std::string& remote_url,
uint32_t remote_id,
- InterfaceProviderPtr remote_interfaces,
- InterfaceRequest<InterfaceProvider> local_interfaces,
+ shell::mojom::InterfaceProviderPtr remote_interfaces,
+ shell::mojom::InterfaceProviderRequest local_interfaces,
const std::set<std::string>& allowed_interfaces);
~ConnectionImpl() override;
@@ -65,8 +66,8 @@ class ConnectionImpl : public Connection, public InterfaceProvider {
const std::string& interface_name) override;
const std::string& GetConnectionURL() override;
const std::string& GetRemoteApplicationURL() override;
- InterfaceProvider* GetRemoteInterfaces() override;
- InterfaceProvider* GetLocalInterfaces() override;
+ shell::mojom::InterfaceProvider* GetRemoteInterfaces() override;
+ shell::mojom::InterfaceProvider* GetLocalInterfaces() override;
void SetRemoteInterfaceProviderConnectionErrorHandler(
const Closure& handler) override;
bool GetRemoteApplicationID(uint32_t* remote_id) const override;
@@ -92,8 +93,8 @@ class ConnectionImpl : public Connection, public InterfaceProvider {
bool remote_ids_valid_;
std::vector<Closure> remote_id_callbacks_;
- Binding<InterfaceProvider> local_binding_;
- InterfaceProviderPtr remote_interfaces_;
+ Binding<shell::mojom::InterfaceProvider> local_binding_;
+ shell::mojom::InterfaceProviderPtr remote_interfaces_;
const std::set<std::string> allowed_interfaces_;
const bool allow_all_interfaces_;
« no previous file with comments | « mojo/shell/public/cpp/lib/application_test_base.cc ('k') | mojo/shell/public/cpp/lib/connection_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698