From 4b41ec18bbd6efa2439c546f1942a5a5a78fe6c5 Mon Sep 17 00:00:00 2001 From: calamity Date: Wed, 25 Mar 2015 21:53:27 -0700 Subject: [PATCH] Make AppListServiceAsh::OnProfileWillBeRemoved do nothing. This CL stops AppListServiceAsh handling an event it shouldn't care about, preventing the AppListServiceViews on Linux handling it correctly. BUG=469032 Review URL: https://codereview.chromium.org/1020133002 Cr-Commit-Position: refs/heads/master@{#322322} --- chrome/browser/ui/ash/app_list/app_list_service_ash.cc | 4 ++++ chrome/browser/ui/ash/app_list/app_list_service_ash.h | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc index 2b325d40c209..2fb7881d2c80 100644 --- a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc +++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc @@ -61,6 +61,10 @@ void AppListServiceAsh::Init(Profile* initial_profile) { service->Init(); } +void AppListServiceAsh::OnProfileWillBeRemoved( + const base::FilePath& profile_path) { +} + base::FilePath AppListServiceAsh::GetProfilePath( const base::FilePath& user_data_dir) { return ChromeLauncherController::instance()->profile()->GetPath(); diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.h b/chrome/browser/ui/ash/app_list/app_list_service_ash.h index a8c42e9c9e6b..6dcc302ca106 100644 --- a/chrome/browser/ui/ash/app_list/app_list_service_ash.h +++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.h @@ -21,6 +21,12 @@ class AppListServiceAsh : public AppListServiceImpl { // AppListService overrides: void Init(Profile* initial_profile) override; + // ProfileInfoCacheObserver overrides: + // On ChromeOS this should never happen. On other platforms, there is always a + // Non-ash AppListService that is responsible for handling this. + // TODO(calamity): Ash shouldn't observe the ProfileInfoCache at all. + void OnProfileWillBeRemoved(const base::FilePath& profile_path) override; + private: friend struct DefaultSingletonTraits; -- 2.11.4.GIT