From e38ced6147678f77eef3c15899c248ec6020288d Mon Sep 17 00:00:00 2001 From: Thanh Nguyen Date: Mon, 17 Jun 2019 01:48:12 +0000 Subject: [PATCH] [Cros-SR Logging] Adds GetClient to AppListController interface Adds GetClient() method to AppListController interface that enables us to notify Chrome from Ash side. E.g. AppListController::Get()->GetClient()->SomeAction() Bug: 972817 Change-Id: I3205848e152943295f070c1dfec499b85f3616b6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1659664 Commit-Queue: Thanh Nguyen Reviewed-by: Jia Meng Reviewed-by: Xiyuan Xia Cr-Commit-Position: refs/heads/master@{#669556} --- ash/app_list/app_list_controller_impl.cc | 5 +++++ ash/app_list/app_list_controller_impl.h | 1 + ash/public/cpp/app_list/app_list_controller.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/ash/app_list/app_list_controller_impl.cc b/ash/app_list/app_list_controller_impl.cc index c211c397fb9c1a..91cdb9fc8c3a01 100644 --- a/ash/app_list/app_list_controller_impl.cc +++ b/ash/app_list/app_list_controller_impl.cc @@ -176,6 +176,11 @@ void AppListControllerImpl::SetClient(app_list::AppListClient* client) { client_ = client; } +app_list::AppListClient* AppListControllerImpl::GetClient() { + DCHECK(client_); + return client_; +} + app_list::AppListModel* AppListControllerImpl::GetModel() { return model_.get(); } diff --git a/ash/app_list/app_list_controller_impl.h b/ash/app_list/app_list_controller_impl.h index 56d9f4db712f4d..73a740795075aa 100644 --- a/ash/app_list/app_list_controller_impl.h +++ b/ash/app_list/app_list_controller_impl.h @@ -75,6 +75,7 @@ class ASH_EXPORT AppListControllerImpl // app_list::AppListController: void SetClient(app_list::AppListClient* client) override; + app_list::AppListClient* GetClient() override; void AddItem(std::unique_ptr app_item) override; void AddItemToFolder(std::unique_ptr app_item, const std::string& folder_id) override; diff --git a/ash/public/cpp/app_list/app_list_controller.h b/ash/public/cpp/app_list/app_list_controller.h index 3763b02187403f..699d126912cc8a 100644 --- a/ash/public/cpp/app_list/app_list_controller.h +++ b/ash/public/cpp/app_list/app_list_controller.h @@ -33,6 +33,9 @@ class ASH_PUBLIC_EXPORT AppListController { // Sets a client to handle calls from Ash. virtual void SetClient(AppListClient* client) = 0; + // Gets the client that handles calls from Ash. + virtual AppListClient* GetClient() = 0; + // Adds an item to AppListModel. virtual void AddItem(std::unique_ptr app_item) = 0;