| 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 "components/view_manager/public/cpp/lib/view_manager_client_impl.h" | 5 #include "components/view_manager/public/cpp/lib/view_manager_client_impl.h" |
| 6 | 6 |
| 7 #include "components/view_manager/public/cpp/lib/view_private.h" | 7 #include "components/view_manager/public/cpp/lib/view_private.h" |
| 8 #include "components/view_manager/public/cpp/util.h" | 8 #include "components/view_manager/public/cpp/util.h" |
| 9 #include "components/view_manager/public/cpp/view_manager_delegate.h" | 9 #include "components/view_manager/public/cpp/view_manager_delegate.h" |
| 10 #include "components/view_manager/public/cpp/view_observer.h" | 10 #include "components/view_manager/public/cpp/view_observer.h" |
| 11 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" | 11 #include "mojo/application/public/cpp/application_impl.h" |
| 12 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h" | 12 #include "mojo/application/public/cpp/connect.h" |
| 13 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl
.h" | 13 #include "mojo/application/public/cpp/service_provider_impl.h" |
| 14 #include "third_party/mojo/src/mojo/public/interfaces/application/service_provid
er.mojom.h" | 14 #include "mojo/application/public/interfaces/service_provider.mojom.h" |
| 15 #include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" | 15 #include "mojo/application/public/interfaces/shell.mojom.h" |
| 16 | 16 |
| 17 namespace mojo { | 17 namespace mojo { |
| 18 | 18 |
| 19 Id MakeTransportId(ConnectionSpecificId connection_id, | 19 Id MakeTransportId(ConnectionSpecificId connection_id, |
| 20 ConnectionSpecificId local_id) { | 20 ConnectionSpecificId local_id) { |
| 21 return (connection_id << 16) | local_id; | 21 return (connection_id << 16) | local_id; |
| 22 } | 22 } |
| 23 | 23 |
| 24 // Helper called to construct a local view object from transport data. | 24 // Helper called to construct a local view object from transport data. |
| 25 View* AddViewToViewManager(ViewManagerClientImpl* client, | 25 View* AddViewToViewManager(ViewManagerClientImpl* client, |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 void ViewManagerClientImpl::OnActionCompleted(bool success) { | 436 void ViewManagerClientImpl::OnActionCompleted(bool success) { |
| 437 if (!change_acked_callback_.is_null()) | 437 if (!change_acked_callback_.is_null()) |
| 438 change_acked_callback_.Run(); | 438 change_acked_callback_.Run(); |
| 439 } | 439 } |
| 440 | 440 |
| 441 Callback<void(bool)> ViewManagerClientImpl::ActionCompletedCallback() { | 441 Callback<void(bool)> ViewManagerClientImpl::ActionCompletedCallback() { |
| 442 return [this](bool success) { OnActionCompleted(success); }; | 442 return [this](bool success) { OnActionCompleted(success); }; |
| 443 } | 443 } |
| 444 | 444 |
| 445 } // namespace mojo | 445 } // namespace mojo |
| OLD | NEW |