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

Unified Diff: services/kiosk_wm/kiosk_wm.cc

Issue 943053003: Simple multi-url support for mojo apps (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: hate Created 5 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
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);
}

Powered by Google App Engine
This is Rietveld 408576698