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

Side by Side Diff: chrome/browser/chromeos/arc/arc_tts_service.cc

Issue 2357053002: Always use arc::InstanceHolder<T>::GetInstanceForMethod (Closed)
Patch Set: review Created 4 years, 3 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
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 "chrome/browser/chromeos/arc/arc_tts_service.h" 5 #include "chrome/browser/chromeos/arc/arc_tts_service.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/speech/tts_controller.h" 8 #include "chrome/browser/speech/tts_controller.h"
9 #include "components/arc/arc_bridge_service.h" 9 #include "components/arc/arc_bridge_service.h"
10 10
11 namespace arc { 11 namespace arc {
12 12
13 ArcTtsService::ArcTtsService(ArcBridgeService* bridge_service) 13 ArcTtsService::ArcTtsService(ArcBridgeService* bridge_service)
14 : ArcService(bridge_service), binding_(this) { 14 : ArcService(bridge_service), binding_(this) {
15 arc_bridge_service()->tts()->AddObserver(this); 15 arc_bridge_service()->tts()->AddObserver(this);
16 } 16 }
17 17
18 ArcTtsService::~ArcTtsService() { 18 ArcTtsService::~ArcTtsService() {
19 arc_bridge_service()->tts()->RemoveObserver(this); 19 arc_bridge_service()->tts()->RemoveObserver(this);
20 } 20 }
21 21
22 void ArcTtsService::OnInstanceReady() { 22 void ArcTtsService::OnInstanceReady() {
23 mojom::TtsInstance* tts_instance = arc_bridge_service()->tts()->instance(); 23 mojom::TtsInstance* tts_instance =
24 if (!tts_instance) { 24 arc_bridge_service()->tts()->GetInstanceForMethod("Init");
25 LOG(ERROR) << "OnTtsInstanceReady called, " 25 if (!tts_instance)
26 << "but no tts instance found";
27 return; 26 return;
28 }
29 tts_instance->Init(binding_.CreateInterfacePtrAndBind()); 27 tts_instance->Init(binding_.CreateInterfacePtrAndBind());
30 } 28 }
31 29
32 void ArcTtsService::OnTtsEvent(uint32_t id, 30 void ArcTtsService::OnTtsEvent(uint32_t id,
33 mojom::TtsEventType event_type, 31 mojom::TtsEventType event_type,
34 uint32_t char_index, 32 uint32_t char_index,
35 const mojo::String& error_msg) { 33 const mojo::String& error_msg) {
36 if (!TtsController::GetInstance()) 34 if (!TtsController::GetInstance())
37 return; 35 return;
38 36
(...skipping 10 matching lines...) Expand all
49 break; 47 break;
50 case mojom::TtsEventType::ERROR: 48 case mojom::TtsEventType::ERROR:
51 chrome_event_type = TTS_EVENT_ERROR; 49 chrome_event_type = TTS_EVENT_ERROR;
52 break; 50 break;
53 } 51 }
54 TtsController::GetInstance()->OnTtsEvent(id, chrome_event_type, char_index, 52 TtsController::GetInstance()->OnTtsEvent(id, chrome_event_type, char_index,
55 error_msg); 53 error_msg);
56 } 54 }
57 55
58 } // namespace arc 56 } // namespace arc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698