| Index: services/kiosk_wm/kiosk_wm.cc
|
| diff --git a/services/kiosk_wm/kiosk_wm.cc b/services/kiosk_wm/kiosk_wm.cc
|
| index 5c22d7fc0663c67f859bc8476abf52fd1c1552b9..636e5415d19dd90ea37a566b4b8553a40769766f 100644
|
| --- a/services/kiosk_wm/kiosk_wm.cc
|
| +++ b/services/kiosk_wm/kiosk_wm.cc
|
| @@ -33,8 +33,9 @@ void KioskWM::Initialize(mojo::ApplicationImpl* app) {
|
| }
|
|
|
| bool KioskWM::ConfigureIncomingConnection(
|
| - mojo::ApplicationConnection* connection) {
|
| - window_manager_app_->ConfigureIncomingConnection(connection);
|
| + mojo::ApplicationConnection* connection,
|
| + const std::string& url) {
|
| + window_manager_app_->ConfigureIncomingConnection(connection, url);
|
| return true;
|
| }
|
|
|
| @@ -114,7 +115,7 @@ void KioskWM::OnViewBoundsChanged(mojo::View* view,
|
| }
|
|
|
| // Convenience method:
|
| -void KioskWM::ReplaceContentWithURL(const mojo::String& url) {
|
| +void KioskWM::ReplaceContentWithURL(const std::string& url) {
|
| Embed(url, nullptr, nullptr);
|
| }
|
|
|
|
|