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 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
527 return; | 527 return; |
528 } | 528 } |
529 history_.erase(history_.begin() + (current_index_ + 1), history_.end()); | 529 history_.erase(history_.begin() + (current_index_ + 1), history_.end()); |
530 history_.push_back(url); | 530 history_.push_back(url); |
531 ++current_index_; | 531 ++current_index_; |
532 } | 532 } |
533 | 533 |
534 } // namespace examples | 534 } // namespace examples |
535 } // namespace mojo | 535 } // namespace mojo |
536 | 536 |
537 MojoResult MojoMain(MojoHandle shell_handle) { | 537 MojoResult MojoMain(MojoHandle application_request) { |
538 mojo::ApplicationRunnerChromium runner(new mojo::examples::WindowManager); | 538 mojo::ApplicationRunnerChromium runner(new mojo::examples::WindowManager); |
539 return runner.Run(shell_handle); | 539 return runner.Run(application_request); |
540 } | 540 } |
OLD | NEW |