Update mojo sdk to rev 126532ce21c5c3c55a1e1693731411cb60169efd

mojo/services/html_viewer/html_viewer.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 "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "gin/public/isolate_holder.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
 #include "mojo/services/html_viewer/html_document.h"
 #include "mojo/services/html_viewer/mojo_blink_platform_impl.h"
 #include "mojo/services/html_viewer/webmediaplayer_factory.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 #if !defined(COMPONENT_BUILD)
 #include "base/i18n/icu_util.h"
 #include "base/path_service.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #endif
 
 using mojo::ApplicationConnection;
 using mojo::Array;
@@ skipping 16 matching lines @@
 // media::Renderer implementation.
 const char kEnableMojoMediaRenderer[] = "enable-mojo-media-renderer";
 
 // Disables support for (unprefixed) Encrypted Media Extensions.
 const char kDisableEncryptedMedia[] = "disable-encrypted-media";
 
 class HTMLViewer;
 
 class HTMLViewerApplication : public mojo::Application {
  public:
-  HTMLViewerApplication(ShellPtr shell,
+  HTMLViewerApplication(InterfaceRequest<Application> request,
                         URLResponsePtr response,
                         scoped_refptr<base::MessageLoopProxy> compositor_thread,
                         WebMediaPlayerFactory* web_media_player_factory)
       : url_(response->url),
-        shell_(shell.Pass()),
+        binding_(this, request.Pass()),
         initial_response_(response.Pass()),
         compositor_thread_(compositor_thread),
-        web_media_player_factory_(web_media_player_factory) {
-    shell_.set_client(this);
+        web_media_player_factory_(web_media_player_factory) {}
+
+  void Initialize(mojo::ShellPtr shell,
+                  mojo::Array<mojo::String> args) override {

[jamesr, 2015/01/28 18:46:25]

we have 'using mojo::Array' and 'mojo::String' declarations on lines 36 / 43, so
you can just say Array<String> args here.

[blundell, 2015/01/29 11:39:31]

Done.

     ServiceProviderPtr service_provider;
     shell_->ConnectToApplication("mojo:network_service",

[jamesr, 2015/01/28 18:46:24]

you probably want to assign shell to shell_ before this

[blundell, 2015/01/29 11:39:31]

whoops! good catch, thanks.

                                  GetProxy(&service_provider), nullptr);
     ConnectToService(service_provider.get(), &network_service_);
   }
 
-  void Initialize(Array<String> args) override {}
-
   void AcceptConnection(const String& requestor_url,
                         InterfaceRequest<ServiceProvider> services,
                         ServiceProviderPtr exposed_services) override {
     if (initial_response_) {
       OnResponseReceived(URLLoaderPtr(), services.Pass(),
                          initial_response_.Pass());
     } else {
       URLLoaderPtr loader;
       network_service_->CreateURLLoader(GetProxy(&loader));
       mojo::URLRequestPtr request(mojo::URLRequest::New());
@@ skipping 16 matching lines @@
 
  private:
   void OnResponseReceived(URLLoaderPtr loader,
                           InterfaceRequest<ServiceProvider> services,
                           URLResponsePtr response) {
     new HTMLDocument(services.Pass(), response.Pass(), shell_.get(),
                      compositor_thread_, web_media_player_factory_);
   }
 
   String url_;
+  mojo::StrongBinding<mojo::Application> binding_;
   ShellPtr shell_;
   mojo::NetworkServicePtr network_service_;
   URLResponsePtr initial_response_;
   scoped_refptr<base::MessageLoopProxy> compositor_thread_;
   WebMediaPlayerFactory* web_media_player_factory_;
 };
 
 class ContentHandlerImpl : public mojo::InterfaceImpl<ContentHandler> {
  public:
   ContentHandlerImpl(scoped_refptr<base::MessageLoopProxy> compositor_thread,
                      WebMediaPlayerFactory* web_media_player_factory)
       : compositor_thread_(compositor_thread),
         web_media_player_factory_(web_media_player_factory) {}
   ~ContentHandlerImpl() override {}
 
  private:
   // Overridden from ContentHandler:
-  void StartApplication(ShellPtr shell, URLResponsePtr response) override {
-    new HTMLViewerApplication(shell.Pass(), response.Pass(), compositor_thread_,
+  void StartApplication(InterfaceRequest<mojo::Application> request,
+                        URLResponsePtr response) override {
+    new HTMLViewerApplication(request.Pass(), response.Pass(), compositor_thread_,
                               web_media_player_factory_);
   }
 
   scoped_refptr<base::MessageLoopProxy> compositor_thread_;
   WebMediaPlayerFactory* web_media_player_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentHandlerImpl);
 };
 
 class HTMLViewer : public mojo::ApplicationDelegate,
@@ skipping 69 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
 };
 
 }  // namespace html_viewer
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new html_viewer::HTMLViewer);
   return runner.Run(shell_handle);
 }