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

Unified Diff: chrome/browser/ui/ash/app_list/app_list_presenter_service.cc

Issue 2898273002: Move Voice Interaction shortcut to accelerator_controller.cc (Closed)
Patch Set: Move Voice Interaction shortcut to accelerator_controller.cc Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/app_list/app_list_presenter_service.cc
diff --git a/chrome/browser/ui/ash/app_list/app_list_presenter_service.cc b/chrome/browser/ui/ash/app_list/app_list_presenter_service.cc
index 3b863cf3859bcc9259dcc7409eb1d49c669005e4..25519373f0ea5baa197f0bc56c1c91451c031411 100644
--- a/chrome/browser/ui/ash/app_list/app_list_presenter_service.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_presenter_service.cc
@@ -7,11 +7,9 @@
#include <utility>
#include "ash/public/interfaces/constants.mojom.h"
+#include "chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.h"
#include "chrome/browser/ui/ash/app_list/app_list_service_ash.h"
-#include "components/arc/arc_bridge_service.h"
#include "components/arc/arc_service_manager.h"
-#include "components/arc/common/voice_interaction_framework.mojom.h"
-#include "components/arc/instance_holder.h"
#include "content/public/common/service_manager_connection.h"
#include "services/service_manager/public/cpp/connector.h"
#include "ui/app_list/presenter/app_list_presenter_impl.h"
@@ -46,13 +44,11 @@ void AppListPresenterService::ToggleAppList(int64_t display_id) {
}
void AppListPresenterService::StartVoiceInteractionSession() {
- arc::mojom::VoiceInteractionFrameworkInstance* framework_instance =
- ARC_GET_INSTANCE_FOR_METHOD(arc::ArcServiceManager::Get()
- ->arc_bridge_service()
- ->voice_interaction_framework(),
- StartVoiceInteractionSession);
- if (framework_instance)
- framework_instance->StartVoiceInteractionSession();
+ arc::ArcVoiceInteractionFrameworkService* service =
+ arc::ArcServiceManager::Get()
+ ->GetService<arc::ArcVoiceInteractionFrameworkService>();
+ if (service)
+ service->StartVoiceInteractionSession();
}
app_list::AppListPresenterImpl* AppListPresenterService::GetPresenter() {
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_utils.cc ('k') | chrome/browser/ui/webui/chromeos/keyboard_overlay_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698