OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "mash/webtest/webtest.h" | 5 #include "mash/webtest/webtest.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/memory/ptr_util.h" |
8 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
9 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
10 #include "base/strings/string16.h" | 11 #include "base/strings/string16.h" |
11 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
12 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
13 #include "base/timer/timer.h" | 14 #include "base/timer/timer.h" |
14 #include "mash/public/interfaces/launchable.mojom.h" | 15 #include "mash/public/interfaces/launchable.mojom.h" |
15 #include "services/navigation/public/interfaces/view.mojom.h" | 16 #include "services/navigation/public/interfaces/view.mojom.h" |
16 #include "services/service_manager/public/c/main.h" | 17 #include "services/service_manager/public/c/main.h" |
17 #include "services/service_manager/public/cpp/connector.h" | 18 #include "services/service_manager/public/cpp/connector.h" |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 AddWindow(window); | 202 AddWindow(window); |
202 } | 203 } |
203 | 204 |
204 void Webtest::Create(const service_manager::Identity& remote_identity, | 205 void Webtest::Create(const service_manager::Identity& remote_identity, |
205 mojom::LaunchableRequest request) { | 206 mojom::LaunchableRequest request) { |
206 bindings_.AddBinding(this, std::move(request)); | 207 bindings_.AddBinding(this, std::move(request)); |
207 } | 208 } |
208 | 209 |
209 } // namespace webtest | 210 } // namespace webtest |
210 } // namespace mash | 211 } // namespace mash |
OLD | NEW |