Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1073)

Side by Side Diff: components/arc/arc_bridge_host_impl.cc

Issue 2757103002: Revert of add voice interaction shortcut. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/arc/arc_bridge_host_impl.h ('k') | components/arc/arc_bridge_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 205
206 void ArcBridgeHostImpl::OnTtsInstanceReady(mojom::TtsInstancePtr tts_ptr) { 206 void ArcBridgeHostImpl::OnTtsInstanceReady(mojom::TtsInstancePtr tts_ptr) {
207 OnInstanceReady(arc_bridge_service_->tts(), std::move(tts_ptr)); 207 OnInstanceReady(arc_bridge_service_->tts(), std::move(tts_ptr));
208 } 208 }
209 209
210 void ArcBridgeHostImpl::OnVideoInstanceReady( 210 void ArcBridgeHostImpl::OnVideoInstanceReady(
211 mojom::VideoInstancePtr video_ptr) { 211 mojom::VideoInstancePtr video_ptr) {
212 OnInstanceReady(arc_bridge_service_->video(), std::move(video_ptr)); 212 OnInstanceReady(arc_bridge_service_->video(), std::move(video_ptr));
213 } 213 }
214 214
215 void ArcBridgeHostImpl::OnVoiceInteractionFrameworkInstanceReady(
216 mojom::VoiceInteractionFrameworkInstancePtr framework_ptr) {
217 OnInstanceReady(arc_bridge_service_->voice_interaction_framework(),
218 std::move(framework_ptr));
219 }
220
221 void ArcBridgeHostImpl::OnWallpaperInstanceReady( 215 void ArcBridgeHostImpl::OnWallpaperInstanceReady(
222 mojom::WallpaperInstancePtr wallpaper_ptr) { 216 mojom::WallpaperInstancePtr wallpaper_ptr) {
223 OnInstanceReady(arc_bridge_service_->wallpaper(), std::move(wallpaper_ptr)); 217 OnInstanceReady(arc_bridge_service_->wallpaper(), std::move(wallpaper_ptr));
224 } 218 }
225 219
226 void ArcBridgeHostImpl::OnClosed() { 220 void ArcBridgeHostImpl::OnClosed() {
227 DCHECK(thread_checker_.CalledOnValidThread()); 221 DCHECK(thread_checker_.CalledOnValidThread());
228 VLOG(1) << "Mojo connection lost"; 222 VLOG(1) << "Mojo connection lost";
229 223
230 // Close all mojo channels. 224 // Close all mojo channels.
(...skipping 30 matching lines...) Expand all
261 void ArcBridgeHostImpl::OnChannelClosed(MojoChannel* channel) { 255 void ArcBridgeHostImpl::OnChannelClosed(MojoChannel* channel) {
262 DCHECK(thread_checker_.CalledOnValidThread()); 256 DCHECK(thread_checker_.CalledOnValidThread());
263 mojo_channels_.erase( 257 mojo_channels_.erase(
264 std::find_if(mojo_channels_.begin(), mojo_channels_.end(), 258 std::find_if(mojo_channels_.begin(), mojo_channels_.end(),
265 [channel](std::unique_ptr<MojoChannel>& ptr) { 259 [channel](std::unique_ptr<MojoChannel>& ptr) {
266 return ptr.get() == channel; 260 return ptr.get() == channel;
267 })); 261 }));
268 } 262 }
269 263
270 } // namespace arc 264 } // namespace arc
OLDNEW
« no previous file with comments | « components/arc/arc_bridge_host_impl.h ('k') | components/arc/arc_bridge_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698