| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "examples/wm_flow/wm/frame_controller.h" | 5 #include "examples/wm_flow/wm/frame_controller.h" |
| 6 #include "mojo/application/application_runner_chromium.h" | 6 #include "mojo/application/application_runner_chromium.h" |
| 7 #include "mojo/public/c/system/main.h" | 7 #include "mojo/public/c/system/main.h" |
| 8 #include "mojo/public/cpp/application/application_delegate.h" | 8 #include "mojo/public/cpp/application/application_delegate.h" |
| 9 #include "mojo/public/cpp/application/application_impl.h" | 9 #include "mojo/public/cpp/application/application_impl.h" |
| 10 #include "mojo/public/cpp/application/service_provider_impl.h" | 10 #include "mojo/public/cpp/application/service_provider_impl.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 private: | 34 private: |
| 35 // Overridden from mojo::ApplicationDelegate: | 35 // Overridden from mojo::ApplicationDelegate: |
| 36 virtual void Initialize(mojo::ApplicationImpl* impl) override { | 36 virtual void Initialize(mojo::ApplicationImpl* impl) override { |
| 37 // FIXME: Mojo applications don't know their URLs yet: | 37 // FIXME: Mojo applications don't know their URLs yet: |
| 38 // https://docs.google.com/a/chromium.org/document/d/1AQ2y6ekzvbdaMF5WrUQmne
yXJnke-MnYYL4Gz1AKDos | 38 // https://docs.google.com/a/chromium.org/document/d/1AQ2y6ekzvbdaMF5WrUQmne
yXJnke-MnYYL4Gz1AKDos |
| 39 url_ = GURL(impl->args()[1]); | 39 url_ = GURL(impl->args()[1]); |
| 40 window_manager_app_->Initialize(impl); | 40 window_manager_app_->Initialize(impl); |
| 41 } | 41 } |
| 42 virtual bool ConfigureIncomingConnection( | 42 virtual bool ConfigureIncomingConnection( |
| 43 mojo::ApplicationConnection* connection) override { | 43 mojo::ApplicationConnection* connection, |
| 44 window_manager_app_->ConfigureIncomingConnection(connection); | 44 const std::string& url) override { |
| 45 window_manager_app_->ConfigureIncomingConnection(connection, url); |
| 45 return true; | 46 return true; |
| 46 } | 47 } |
| 47 | 48 |
| 48 // Overridden from mojo::ViewManagerDelegate: | 49 // Overridden from mojo::ViewManagerDelegate: |
| 49 virtual void OnEmbed(mojo::View* root, | 50 virtual void OnEmbed(mojo::View* root, |
| 50 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 51 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 51 mojo::ServiceProviderPtr exposed_services) override { | 52 mojo::ServiceProviderPtr exposed_services) override { |
| 52 root_ = root; | 53 root_ = root; |
| 53 | 54 |
| 54 window_container_ = root->view_manager()->CreateView(); | 55 window_container_ = root->view_manager()->CreateView(); |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 | 122 |
| 122 DISALLOW_COPY_AND_ASSIGN(SimpleWM); | 123 DISALLOW_COPY_AND_ASSIGN(SimpleWM); |
| 123 }; | 124 }; |
| 124 | 125 |
| 125 } // namespace examples | 126 } // namespace examples |
| 126 | 127 |
| 127 MojoResult MojoMain(MojoHandle shell_handle) { | 128 MojoResult MojoMain(MojoHandle shell_handle) { |
| 128 mojo::ApplicationRunnerChromium runner(new examples::SimpleWM); | 129 mojo::ApplicationRunnerChromium runner(new examples::SimpleWM); |
| 129 return runner.Run(shell_handle); | 130 return runner.Run(shell_handle); |
| 130 } | 131 } |
| OLD | NEW |