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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 | 139 |
140 void AppListServiceAsh::ShowForProfile(Profile* /*default_profile*/) { | 140 void AppListServiceAsh::ShowForProfile(Profile* /*default_profile*/) { |
141 // This may not work correctly if the profile passed in is different from the | 141 // This may not work correctly if the profile passed in is different from the |
142 // one the ash Shell is currently using. | 142 // one the ash Shell is currently using. |
143 app_list_presenter_->Show(ash::Shell::GetTargetDisplayId()); | 143 app_list_presenter_->Show(ash::Shell::GetTargetDisplayId()); |
144 } | 144 } |
145 | 145 |
146 void AppListServiceAsh::ShowForAppInstall(Profile* profile, | 146 void AppListServiceAsh::ShowForAppInstall(Profile* profile, |
147 const std::string& extension_id, | 147 const std::string& extension_id, |
148 bool start_discovery_tracking) { | 148 bool start_discovery_tracking) { |
149 if (app_list::switches::IsExperimentalAppListEnabled()) | 149 ShowAndSwitchToState(app_list::AppListModel::STATE_APPS); |
150 ShowAndSwitchToState(app_list::AppListModel::STATE_APPS); | |
151 | |
152 AppListServiceImpl::ShowForAppInstall(profile, extension_id, | 150 AppListServiceImpl::ShowForAppInstall(profile, extension_id, |
153 start_discovery_tracking); | 151 start_discovery_tracking); |
154 } | 152 } |
155 | 153 |
156 void AppListServiceAsh::ShowForCustomLauncherPage(Profile* /*profile*/) { | 154 void AppListServiceAsh::ShowForCustomLauncherPage(Profile* /*profile*/) { |
157 ShowAndSwitchToState(app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE); | 155 ShowAndSwitchToState(app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE); |
158 } | 156 } |
159 | 157 |
160 void AppListServiceAsh::HideCustomLauncherPage() { | 158 void AppListServiceAsh::HideCustomLauncherPage() { |
161 app_list::AppListView* app_list_view = app_list_presenter_->GetView(); | 159 app_list::AppListView* app_list_view = app_list_presenter_->GetView(); |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 // static | 203 // static |
206 AppListService* AppListService::Get() { | 204 AppListService* AppListService::Get() { |
207 return AppListServiceAsh::GetInstance(); | 205 return AppListServiceAsh::GetInstance(); |
208 } | 206 } |
209 | 207 |
210 // static | 208 // static |
211 void AppListService::InitAll(Profile* initial_profile, | 209 void AppListService::InitAll(Profile* initial_profile, |
212 const base::FilePath& profile_path) { | 210 const base::FilePath& profile_path) { |
213 AppListServiceAsh::GetInstance()->Init(initial_profile); | 211 AppListServiceAsh::GetInstance()->Init(initial_profile); |
214 } | 212 } |
OLD | NEW |