| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/ui/ash/app_list/app_list_service_ash.h" | 5 #include "chrome/browser/ui/ash/app_list/app_list_service_ash.h" |
| 6 | 6 |
| 7 #include "ash/app_list/app_list_presenter_delegate.h" | 7 #include "ash/app_list/app_list_presenter_delegate.h" |
| 8 #include "ash/app_list/app_list_presenter_delegate_factory.h" | 8 #include "ash/app_list/app_list_presenter_delegate_factory.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 } // namespace | 73 } // namespace |
| 74 | 74 |
| 75 // static | 75 // static |
| 76 AppListServiceAsh* AppListServiceAsh::GetInstance() { | 76 AppListServiceAsh* AppListServiceAsh::GetInstance() { |
| 77 return base::Singleton<AppListServiceAsh, | 77 return base::Singleton<AppListServiceAsh, |
| 78 base::LeakySingletonTraits<AppListServiceAsh>>::get(); | 78 base::LeakySingletonTraits<AppListServiceAsh>>::get(); |
| 79 } | 79 } |
| 80 | 80 |
| 81 AppListServiceAsh::AppListServiceAsh() { | 81 AppListServiceAsh::AppListServiceAsh() { |
| 82 std::unique_ptr<app_list::AppListPresenterDelegateFactory> factory; | 82 std::unique_ptr<app_list::AppListPresenterDelegateFactory> factory; |
| 83 if (ash_util::IsRunningInMash()) { | 83 if (IsRunningInMash()) { |
| 84 factory = base::MakeUnique<AppListPresenterDelegateFactoryMus>( | 84 factory = base::MakeUnique<AppListPresenterDelegateFactoryMus>( |
| 85 base::MakeUnique<ViewDelegateFactoryImpl>(this)); | 85 base::MakeUnique<ViewDelegateFactoryImpl>(this)); |
| 86 } else { | 86 } else { |
| 87 factory = base::MakeUnique<ash::AppListPresenterDelegateFactory>( | 87 factory = base::MakeUnique<ash::AppListPresenterDelegateFactory>( |
| 88 base::MakeUnique<ViewDelegateFactoryImpl>(this)); | 88 base::MakeUnique<ViewDelegateFactoryImpl>(this)); |
| 89 } | 89 } |
| 90 app_list_presenter_ = | 90 app_list_presenter_ = |
| 91 base::MakeUnique<app_list::AppListPresenterImpl>(std::move(factory)); | 91 base::MakeUnique<app_list::AppListPresenterImpl>(std::move(factory)); |
| 92 controller_delegate_ = | 92 controller_delegate_ = |
| 93 base::MakeUnique<AppListControllerDelegateAsh>(app_list_presenter_.get()); | 93 base::MakeUnique<AppListControllerDelegateAsh>(app_list_presenter_.get()); |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 // static | 209 // static |
| 210 AppListService* AppListService::Get() { | 210 AppListService* AppListService::Get() { |
| 211 return AppListServiceAsh::GetInstance(); | 211 return AppListServiceAsh::GetInstance(); |
| 212 } | 212 } |
| 213 | 213 |
| 214 // static | 214 // static |
| 215 void AppListService::InitAll(Profile* initial_profile, | 215 void AppListService::InitAll(Profile* initial_profile, |
| 216 const base::FilePath& profile_path) { | 216 const base::FilePath& profile_path) { |
| 217 AppListServiceAsh::GetInstance()->Init(initial_profile); | 217 AppListServiceAsh::GetInstance()->Init(initial_profile); |
| 218 } | 218 } |
| OLD | NEW |