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 "chrome/browser/extensions/api/hotword_private/hotword_private_api.h" | 5 #include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 result.available = hotword_service->IsServiceAvailable(); | 159 result.available = hotword_service->IsServiceAvailable(); |
160 result.enabled = hotword_service->IsSometimesOnEnabled(); | 160 result.enabled = hotword_service->IsSometimesOnEnabled(); |
161 result.audio_logging_enabled = hotword_service->IsOptedIntoAudioLogging(); | 161 result.audio_logging_enabled = hotword_service->IsOptedIntoAudioLogging(); |
162 result.training_enabled = hotword_service->IsTraining(); | 162 result.training_enabled = hotword_service->IsTraining(); |
163 result.always_on_enabled = hotword_service->IsAlwaysOnEnabled(); | 163 result.always_on_enabled = hotword_service->IsAlwaysOnEnabled(); |
164 result.user_is_active = hotword_service->UserIsActive(); | 164 result.user_is_active = hotword_service->UserIsActive(); |
165 } | 165 } |
166 | 166 |
167 PrefService* prefs = GetProfile()->GetPrefs(); | 167 PrefService* prefs = GetProfile()->GetPrefs(); |
168 result.enabled_set = prefs->HasPrefPath(prefs::kHotwordSearchEnabled); | 168 result.enabled_set = prefs->HasPrefPath(prefs::kHotwordSearchEnabled); |
169 result.experimental_hotword_enabled = | 169 // TODO(amistry): Remove this. Nothing uses it. |
170 HotwordService::IsExperimentalHotwordingEnabled(); | 170 result.experimental_hotword_enabled = true; |
171 | 171 |
172 SetResult(result.ToValue().release()); | 172 SetResult(result.ToValue().release()); |
173 return true; | 173 return true; |
174 } | 174 } |
175 | 175 |
176 bool HotwordPrivateSetHotwordSessionStateFunction::RunSync() { | 176 bool HotwordPrivateSetHotwordSessionStateFunction::RunSync() { |
177 scoped_ptr<api::hotword_private::SetHotwordSessionState::Params> params( | 177 scoped_ptr<api::hotword_private::SetHotwordSessionState::Params> params( |
178 api::hotword_private::SetHotwordSessionState::Params::Create(*args_)); | 178 api::hotword_private::SetHotwordSessionState::Params::Create(*args_)); |
179 EXTENSION_FUNCTION_VALIDATE(params.get()); | 179 EXTENSION_FUNCTION_VALIDATE(params.get()); |
180 | 180 |
(...skipping 22 matching lines...) Expand all Loading... |
203 preamble->sample_data.swap(params->log->buffer); | 203 preamble->sample_data.swap(params->log->buffer); |
204 } | 204 } |
205 | 205 |
206 HotwordService* hotword_service = | 206 HotwordService* hotword_service = |
207 HotwordServiceFactory::GetForProfile(GetProfile()); | 207 HotwordServiceFactory::GetForProfile(GetProfile()); |
208 if (hotword_service) { | 208 if (hotword_service) { |
209 if (hotword_service->IsTraining()) { | 209 if (hotword_service->IsTraining()) { |
210 hotword_service->NotifyHotwordTriggered(); | 210 hotword_service->NotifyHotwordTriggered(); |
211 } else if (hotword_service->client()) { | 211 } else if (hotword_service->client()) { |
212 hotword_service->client()->OnHotwordRecognized(preamble); | 212 hotword_service->client()->OnHotwordRecognized(preamble); |
213 } else if (HotwordService::IsExperimentalHotwordingEnabled() && | 213 } else if (hotword_service->IsAlwaysOnEnabled()) { |
214 hotword_service->IsAlwaysOnEnabled()) { | |
215 Browser* browser = GetCurrentBrowser(); | 214 Browser* browser = GetCurrentBrowser(); |
216 // If a Browser does not exist, fall back to the universally available, | 215 // If a Browser does not exist, fall back to the universally available, |
217 // but not recommended, way. | 216 // but not recommended, way. |
218 AppListService* app_list_service = AppListService::Get( | 217 AppListService* app_list_service = AppListService::Get( |
219 browser ? browser->host_desktop_type() : chrome::GetActiveDesktop()); | 218 browser ? browser->host_desktop_type() : chrome::GetActiveDesktop()); |
220 CHECK(app_list_service); | 219 CHECK(app_list_service); |
221 app_list_service->ShowForVoiceSearch(GetProfile(), preamble); | 220 app_list_service->ShowForVoiceSearch(GetProfile(), preamble); |
222 } | 221 } |
223 } | 222 } |
224 return true; | 223 return true; |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 void HotwordPrivateGetAudioHistoryEnabledFunction::SetResultAndSendResponse( | 443 void HotwordPrivateGetAudioHistoryEnabledFunction::SetResultAndSendResponse( |
445 bool success, bool new_enabled_value) { | 444 bool success, bool new_enabled_value) { |
446 api::hotword_private::AudioHistoryState result; | 445 api::hotword_private::AudioHistoryState result; |
447 result.success = success; | 446 result.success = success; |
448 result.enabled = new_enabled_value; | 447 result.enabled = new_enabled_value; |
449 SetResult(result.ToValue().release()); | 448 SetResult(result.ToValue().release()); |
450 SendResponse(true); | 449 SendResponse(true); |
451 } | 450 } |
452 | 451 |
453 } // namespace extensions | 452 } // namespace extensions |
OLD | NEW |