Simple multi-url support for mojo apps

services/kiosk_wm/kiosk_wm.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/kiosk_wm/kiosk_wm.h"
 
 #include "services/window_manager/basic_focus_rules.h"
 
 namespace kiosk_wm {
 
@@ skipping 15 matching lines @@
 
 void KioskWM::Initialize(mojo::ApplicationImpl* app) {
   window_manager_app_->Initialize(app);
 
   // Format: --args-for="app_url default_url"
   if (app->args().size() > 1)
     default_url_ = app->args()[1];
 }
 
 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;
 }
 
 bool KioskWM::ConfigureOutgoingConnection(
     mojo::ApplicationConnection* connection) {
   window_manager_app_->ConfigureOutgoingConnection(connection);
   return true;
 }
 
 void KioskWM::OnEmbed(
@@ skipping 59 matching lines @@
   view->RemoveObserver(this);
 }
 
 void KioskWM::OnViewBoundsChanged(mojo::View* view,
                                               const mojo::Rect& old_bounds,
                                               const mojo::Rect& new_bounds) {
   content_->SetBounds(new_bounds);
 }
 
 // Convenience method:
-void KioskWM::ReplaceContentWithURL(const mojo::String& url) {
+void KioskWM::ReplaceContentWithURL(const std::string& url) {
   Embed(url, nullptr, nullptr);
 }
 
 bool KioskWM::AcceleratorPressed(const ui::Accelerator& accelerator,
                                  ui::EventTarget* target) {
   if (accelerator.key_code() != ui::VKEY_BROWSER_BACK)
     return false;
   navigator_host_.RequestNavigateHistory(-1);
   return true;
 }
 
 bool KioskWM::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace kiosk_wm