| Index: chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h
|
| diff --git a/chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h b/chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h
|
| index 7180bb1760632f49035e2468800eb365ed353f23..62a530c474265d0f1789e36a3fdf942e5b00fdae 100644
|
| --- a/chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h
|
| +++ b/chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/scoped_observer.h"
|
| +#include "chrome/browser/chromeos/arc/arc_session_manager.h"
|
| #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
|
| #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
|
|
|
| @@ -23,7 +24,8 @@ namespace chromeos {
|
| namespace settings {
|
|
|
| class AndroidAppsHandler : public ::settings::SettingsPageUIHandler,
|
| - public ArcAppListPrefs::Observer {
|
| + public ArcAppListPrefs::Observer,
|
| + public arc::ArcSessionManager::Observer {
|
| public:
|
| explicit AndroidAppsHandler(Profile* profile);
|
| ~AndroidAppsHandler() override;
|
| @@ -34,11 +36,13 @@ class AndroidAppsHandler : public ::settings::SettingsPageUIHandler,
|
| void OnJavascriptDisallowed() override;
|
|
|
| // ArcAppListPrefs::Observer
|
| - void OnAppReadyChanged(const std::string& app_id, bool ready) override;
|
| void OnAppRemoved(const std::string& app_id) override;
|
| void OnAppRegistered(const std::string& app_id,
|
| const ArcAppListPrefs::AppInfo& app_info) override;
|
|
|
| + // arc::ArcSessionManager::Observer:
|
| + void OnArcPlayStoreEnabledChanged(bool enabled) override;
|
| +
|
| private:
|
| std::unique_ptr<base::DictionaryValue> BuildAndroidAppsInfo();
|
| void OnAppChanged(const std::string& app_id);
|
| @@ -48,6 +52,8 @@ class AndroidAppsHandler : public ::settings::SettingsPageUIHandler,
|
|
|
| ScopedObserver<ArcAppListPrefs, ArcAppListPrefs::Observer>
|
| arc_prefs_observer_;
|
| + ScopedObserver<arc::ArcSessionManager, arc::ArcSessionManager::Observer>
|
| + arc_session_manager_observer_;
|
| Profile* profile_; // unowned
|
| base::WeakPtrFactory<AndroidAppsHandler> weak_ptr_factory_;
|
|
|
|
|