| Index: chrome/browser/ui/app_list/arc/arc_app_list_prefs.h
|
| diff --git a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.h b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.h
|
| index a8e7bbae9aa1fb30e6577afb1e5de170fde72fa4..1277a852a29586845f36ac4b3d965b8138c81c44 100644
|
| --- a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.h
|
| +++ b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include <map>
|
| #include <set>
|
| +#include <string>
|
| #include <vector>
|
|
|
| #include "base/files/file_path.h"
|
| @@ -33,8 +34,8 @@ class PrefRegistrySyncable;
|
| // information is used to pre-create non-ready app items while ARC bridge
|
| // service is not ready to provide information about available ARC apps.
|
| class ArcAppListPrefs : public KeyedService,
|
| - public arc::ArcBridgeService::Observer,
|
| - public arc::ArcBridgeService::AppObserver {
|
| + public arc::AppHost,
|
| + public arc::ArcBridgeService::Observer {
|
| public:
|
| struct AppInfo {
|
| AppInfo(const std::string& name,
|
| @@ -101,18 +102,21 @@ class ArcAppListPrefs : public KeyedService,
|
| void AddObserver(Observer* observer);
|
| void RemoveObserver(Observer* observer);
|
|
|
| - // arc::ArcBridgeService::Observer
|
| - void OnStateChanged(arc::ArcBridgeService::State state) override;
|
| - void OnAppListRefreshed(const std::vector<arc::AppInfo>& apps) override;
|
| - void OnAppIcon(const std::string& package,
|
| - const std::string& activity,
|
| - arc::ScaleFactor scale_factor,
|
| - const std::vector<uint8_t>& icon_png_data) override;
|
| -
|
| private:
|
| // See the Create methods.
|
| ArcAppListPrefs(const base::FilePath& base_path, PrefService* prefs);
|
|
|
| + // arc::ArcBridgeService::Observer:
|
| + void OnStateChanged(arc::ArcBridgeService::State state) override;
|
| + void OnAppInstanceReady() override;
|
| +
|
| + // arc::AppHost:
|
| + void OnAppListRefreshed(mojo::Array<arc::AppInfoPtr> apps) override;
|
| + void OnAppIcon(const mojo::String& package,
|
| + const mojo::String& activity,
|
| + arc::ScaleFactor scale_factor,
|
| + mojo::Array<uint8_t> icon_png_data) override;
|
| +
|
| void OnAppReady(const arc::AppInfo& app);
|
| void DisableAllApps();
|
|
|
|
|