Chromium Code Reviews| 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 "components/arc/arc_bridge_host_impl.h" | 5 #include "components/arc/arc_bridge_host_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 123 OnInstanceReady(arc_bridge_service_->enterprise_reporting(), | 123 OnInstanceReady(arc_bridge_service_->enterprise_reporting(), |
| 124 std::move(enterprise_reporting_ptr)); | 124 std::move(enterprise_reporting_ptr)); |
| 125 } | 125 } |
| 126 | 126 |
| 127 void ArcBridgeHostImpl::OnFileSystemInstanceReady( | 127 void ArcBridgeHostImpl::OnFileSystemInstanceReady( |
| 128 mojom::FileSystemInstancePtr file_system_ptr) { | 128 mojom::FileSystemInstancePtr file_system_ptr) { |
| 129 OnInstanceReady(arc_bridge_service_->file_system(), | 129 OnInstanceReady(arc_bridge_service_->file_system(), |
| 130 std::move(file_system_ptr)); | 130 std::move(file_system_ptr)); |
| 131 } | 131 } |
| 132 | 132 |
| 133 void ArcBridgeHostImpl::OnFocusHighlightInstanceReady( | |
| 134 mojom::FocusHighlightInstancePtr focus_highlight_ptr) { | |
| 135 OnInstanceReady(ArcBridgeService::Get()->focus_highlight(), | |
|
hidehiko
2016/12/12 01:58:30
ArcBridgeService::Get() is being removed very soon
yawano
2017/01/11 10:31:33
Done.
| |
| 136 std::move(focus_highlight_ptr)); | |
| 137 } | |
| 138 | |
| 133 void ArcBridgeHostImpl::OnImeInstanceReady(mojom::ImeInstancePtr ime_ptr) { | 139 void ArcBridgeHostImpl::OnImeInstanceReady(mojom::ImeInstancePtr ime_ptr) { |
| 134 OnInstanceReady(arc_bridge_service_->ime(), std::move(ime_ptr)); | 140 OnInstanceReady(arc_bridge_service_->ime(), std::move(ime_ptr)); |
| 135 } | 141 } |
| 136 | 142 |
| 137 void ArcBridgeHostImpl::OnIntentHelperInstanceReady( | 143 void ArcBridgeHostImpl::OnIntentHelperInstanceReady( |
| 138 mojom::IntentHelperInstancePtr intent_helper_ptr) { | 144 mojom::IntentHelperInstancePtr intent_helper_ptr) { |
| 139 OnInstanceReady(arc_bridge_service_->intent_helper(), | 145 OnInstanceReady(arc_bridge_service_->intent_helper(), |
| 140 std::move(intent_helper_ptr)); | 146 std::move(intent_helper_ptr)); |
| 141 } | 147 } |
| 142 | 148 |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 244 void ArcBridgeHostImpl::OnChannelClosed(MojoChannel* channel) { | 250 void ArcBridgeHostImpl::OnChannelClosed(MojoChannel* channel) { |
| 245 DCHECK(thread_checker_.CalledOnValidThread()); | 251 DCHECK(thread_checker_.CalledOnValidThread()); |
| 246 mojo_channels_.erase( | 252 mojo_channels_.erase( |
| 247 std::find_if(mojo_channels_.begin(), mojo_channels_.end(), | 253 std::find_if(mojo_channels_.begin(), mojo_channels_.end(), |
| 248 [channel](std::unique_ptr<MojoChannel>& ptr) { | 254 [channel](std::unique_ptr<MojoChannel>& ptr) { |
| 249 return ptr.get() == channel; | 255 return ptr.get() == channel; |
| 250 })); | 256 })); |
| 251 } | 257 } |
| 252 | 258 |
| 253 } // namespace arc | 259 } // namespace arc |
| OLD | NEW |