| Index: chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc
|
| diff --git a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc
|
| index 16b19ce958acd5d4ec41d1481ebb5766d8ca00e6..916741dfcbf6b739c4885d4e8658bb38a2348995 100644
|
| --- a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc
|
| +++ b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc
|
| @@ -12,6 +12,7 @@
|
| #include "chrome/browser/ui/app_list/app_list_shower.h"
|
| #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
|
| #include "chrome/browser/ui/app_list/scoped_keep_alive.h"
|
| +#include "chrome/browser/ui/ash/app_list/app_list_service_ash.h"
|
| #include "chrome/browser/ui/views/app_list/linux/app_list_controller_delegate_linux.h"
|
| #include "chrome/browser/ui/views/app_list/linux/app_list_linux.h"
|
| #include "content/public/browser/browser_thread.h"
|
| @@ -140,10 +141,14 @@ AppListServiceLinux::AppListServiceLinux()
|
|
|
| // static
|
| AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) {
|
| + if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
|
| + return AppListServiceAsh::GetInstance();
|
| +
|
| return AppListServiceLinux::GetInstance();
|
| }
|
|
|
| // static
|
| void AppListService::InitAll(Profile* initial_profile) {
|
| + AppListServiceAsh::GetInstance()->Init(initial_profile);
|
| AppListServiceLinux::GetInstance()->Init(initial_profile);
|
| }
|
|
|