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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/macros.h" | 6 #include "base/macros.h" |
7 #include "examples/window_manager/debug_panel_host.mojom.h" | 7 #include "examples/window_manager/debug_panel_host.mojom.h" |
8 #include "examples/window_manager/window_manager.mojom.h" | 8 #include "examples/window_manager/window_manager.mojom.h" |
9 #include "mojo/application/application_runner_chromium.h" | 9 #include "mojo/application/application_runner_chromium.h" |
10 #include "mojo/common/weak_binding_set.h" | 10 #include "mojo/common/weak_binding_set.h" |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 void Initialize(ApplicationImpl* app) override { | 281 void Initialize(ApplicationImpl* app) override { |
282 shell_ = app->shell(); | 282 shell_ = app->shell(); |
283 app_ = app; | 283 app_ = app; |
284 // FIXME: Mojo applications don't know their URLs yet: | 284 // FIXME: Mojo applications don't know their URLs yet: |
285 // https://docs.google.com/a/chromium.org/document/d/1AQ2y6ekzvbdaMF5WrUQmne
yXJnke-MnYYL4Gz1AKDos | 285 // https://docs.google.com/a/chromium.org/document/d/1AQ2y6ekzvbdaMF5WrUQmne
yXJnke-MnYYL4Gz1AKDos |
286 url_ = GURL(app->args()[1]); | 286 url_ = GURL(app->args()[1]); |
287 window_manager_app_->Initialize(app); | 287 window_manager_app_->Initialize(app); |
288 } | 288 } |
289 | 289 |
290 virtual bool ConfigureIncomingConnection( | 290 virtual bool ConfigureIncomingConnection( |
291 ApplicationConnection* connection) override { | 291 ApplicationConnection* connection, |
| 292 const std::string& url) override { |
292 connection->AddService<IWindowManager>(this); | 293 connection->AddService<IWindowManager>(this); |
293 window_manager_app_->ConfigureIncomingConnection(connection); | 294 window_manager_app_->ConfigureIncomingConnection(connection, url); |
294 return true; | 295 return true; |
295 } | 296 } |
296 | 297 |
297 // Overridden from ViewManagerDelegate: | 298 // Overridden from ViewManagerDelegate: |
298 void OnEmbed(View* root, | 299 void OnEmbed(View* root, |
299 InterfaceRequest<ServiceProvider> services, | 300 InterfaceRequest<ServiceProvider> services, |
300 ServiceProviderPtr exposed_services) override { | 301 ServiceProviderPtr exposed_services) override { |
301 DCHECK(!view_manager_); | 302 DCHECK(!view_manager_); |
302 view_manager_ = root->view_manager(); | 303 view_manager_ = root->view_manager(); |
303 | 304 |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
532 ++current_index_; | 533 ++current_index_; |
533 } | 534 } |
534 | 535 |
535 } // namespace examples | 536 } // namespace examples |
536 } // namespace mojo | 537 } // namespace mojo |
537 | 538 |
538 MojoResult MojoMain(MojoHandle shell_handle) { | 539 MojoResult MojoMain(MojoHandle shell_handle) { |
539 mojo::ApplicationRunnerChromium runner(new mojo::examples::WindowManager); | 540 mojo::ApplicationRunnerChromium runner(new mojo::examples::WindowManager); |
540 return runner.Run(shell_handle); | 541 return runner.Run(shell_handle); |
541 } | 542 } |
OLD | NEW |