Index: mandoline/ui/omnibox/omnibox_application.cc |
diff --git a/mandoline/ui/omnibox/omnibox_application.cc b/mandoline/ui/omnibox/omnibox_application.cc |
index 7674d0d397d5113512ba4c0ed2f2529293603fc5..0ee9c5b8ef6c087915617af5d41ddc1e7779779a 100644 |
--- a/mandoline/ui/omnibox/omnibox_application.cc |
+++ b/mandoline/ui/omnibox/omnibox_application.cc |
@@ -37,7 +37,7 @@ class OmniboxImpl : public mus::WindowTreeDelegate, |
public Omnibox { |
public: |
OmniboxImpl(mojo::Shell* shell, |
- mojo::ApplicationConnection* connection, |
+ mojo::Connection* connection, |
mojo::InterfaceRequest<Omnibox> request); |
~OmniboxImpl() override; |
@@ -81,7 +81,7 @@ OmniboxApplication::OmniboxApplication() : shell_(nullptr) {} |
OmniboxApplication::~OmniboxApplication() {} |
//////////////////////////////////////////////////////////////////////////////// |
-// OmniboxApplication, mojo::ApplicationDelegate implementation: |
+// OmniboxApplication, mojo::ShellClient implementation: |
void OmniboxApplication::Initialize(mojo::Shell* shell, const std::string& url, |
uint32_t id) { |
@@ -89,8 +89,7 @@ void OmniboxApplication::Initialize(mojo::Shell* shell, const std::string& url, |
tracing_.Initialize(shell, url); |
} |
-bool OmniboxApplication::AcceptConnection( |
- mojo::ApplicationConnection* connection) { |
+bool OmniboxApplication::AcceptConnection(mojo::Connection* connection) { |
connection->AddService<Omnibox>(this); |
return true; |
} |
@@ -98,7 +97,7 @@ bool OmniboxApplication::AcceptConnection( |
//////////////////////////////////////////////////////////////////////////////// |
// OmniboxApplication, mojo::InterfaceFactory<Omnibox> implementation: |
-void OmniboxApplication::Create(mojo::ApplicationConnection* connection, |
+void OmniboxApplication::Create(mojo::Connection* connection, |
mojo::InterfaceRequest<Omnibox> request) { |
new OmniboxImpl(shell_, connection, std::move(request)); |
} |
@@ -107,7 +106,7 @@ void OmniboxApplication::Create(mojo::ApplicationConnection* connection, |
// OmniboxImpl, public: |
OmniboxImpl::OmniboxImpl(mojo::Shell* shell, |
- mojo::ApplicationConnection* connection, |
+ mojo::Connection* connection, |
mojo::InterfaceRequest<Omnibox> request) |
: shell_(shell), |
root_(nullptr), |