OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "mojo/shell/shell_impl.h" | 5 #include "mojo/shell/shell_impl.h" |
6 | 6 |
| 7 #include "mojo/application/public/interfaces/content_handler.mojom.h" |
7 #include "mojo/common/common_type_converters.h" | 8 #include "mojo/common/common_type_converters.h" |
8 #include "mojo/common/url_type_converters.h" | 9 #include "mojo/common/url_type_converters.h" |
9 #include "mojo/shell/application_manager.h" | 10 #include "mojo/shell/application_manager.h" |
10 #include "third_party/mojo_services/src/content_handler/public/interfaces/conten
t_handler.mojom.h" | |
11 | 11 |
12 namespace mojo { | 12 namespace mojo { |
13 namespace shell { | 13 namespace shell { |
14 | 14 |
15 ShellImpl::ShellImpl(ApplicationPtr application, | 15 ShellImpl::ShellImpl(ApplicationPtr application, |
16 ApplicationManager* manager, | 16 ApplicationManager* manager, |
17 const Identity& identity, | 17 const Identity& identity, |
18 const base::Closure& on_application_end) | 18 const base::Closure& on_application_end) |
19 : manager_(manager), | 19 : manager_(manager), |
20 identity_(identity), | 20 identity_(identity), |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 manager_->ConnectToApplication(app_gurl, identity_.url, services.Pass(), | 53 manager_->ConnectToApplication(app_gurl, identity_.url, services.Pass(), |
54 exposed_services.Pass(), base::Closure()); | 54 exposed_services.Pass(), base::Closure()); |
55 } | 55 } |
56 | 56 |
57 void ShellImpl::OnConnectionError() { | 57 void ShellImpl::OnConnectionError() { |
58 manager_->OnShellImplError(this); | 58 manager_->OnShellImplError(this); |
59 } | 59 } |
60 | 60 |
61 } // namespace shell | 61 } // namespace shell |
62 } // namespace mojo | 62 } // namespace mojo |
OLD | NEW |