| 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 3dce5be03a67eb73e01eaedfef1c8ab34eef0f70..83b0a70143297723eaf340535820230baa74780f 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
|
| @@ -17,6 +17,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| +#include "base/optional.h"
|
| #include "base/time/time.h"
|
| #include "chrome/browser/chromeos/arc/arc_auth_service.h"
|
| #include "chrome/browser/ui/app_list/arc/arc_default_app_list.h"
|
| @@ -256,32 +257,32 @@ class ArcAppListPrefs
|
| void OnInstanceClosed() override;
|
|
|
| // arc::mojom::AppHost:
|
| - void OnAppListRefreshed(mojo::Array<arc::mojom::AppInfoPtr> apps) override;
|
| + void OnAppListRefreshed(std::vector<arc::mojom::AppInfoPtr> apps) override;
|
| void OnAppAddedDeprecated(arc::mojom::AppInfoPtr app) override;
|
| void OnPackageAppListRefreshed(
|
| - const mojo::String& package_name,
|
| - mojo::Array<arc::mojom::AppInfoPtr> apps) override;
|
| + const std::string& package_name,
|
| + std::vector<arc::mojom::AppInfoPtr> apps) override;
|
| void OnInstallShortcut(arc::mojom::ShortcutInfoPtr app) override;
|
| - void OnPackageRemoved(const mojo::String& package_name) override;
|
| - void OnAppIcon(const mojo::String& package_name,
|
| - const mojo::String& activity,
|
| + void OnPackageRemoved(const std::string& package_name) override;
|
| + void OnAppIcon(const std::string& package_name,
|
| + const std::string& activity,
|
| arc::mojom::ScaleFactor scale_factor,
|
| - mojo::Array<uint8_t> icon_png_data) override;
|
| - void OnIcon(const mojo::String& app_id,
|
| + const std::vector<uint8_t>& icon_png_data) override;
|
| + void OnIcon(const std::string& app_id,
|
| arc::mojom::ScaleFactor scale_factor,
|
| - mojo::Array<uint8_t> icon_png_data);
|
| + const std::vector<uint8_t>& icon_png_data);
|
| void OnTaskCreated(int32_t task_id,
|
| - const mojo::String& package_name,
|
| - const mojo::String& activity,
|
| - const mojo::String& name) override;
|
| + const std::string& package_name,
|
| + const std::string& activity,
|
| + const base::Optional<std::string>& name) override;
|
| void OnTaskDestroyed(int32_t task_id) override;
|
| void OnTaskSetActive(int32_t task_id) override;
|
| - void OnNotificationsEnabledChanged(const mojo::String& package_name,
|
| + void OnNotificationsEnabledChanged(const std::string& package_name,
|
| bool enabled) override;
|
| void OnPackageAdded(arc::mojom::ArcPackageInfoPtr package_info) override;
|
| void OnPackageModified(arc::mojom::ArcPackageInfoPtr package_info) override;
|
| void OnPackageListRefreshed(
|
| - mojo::Array<arc::mojom::ArcPackageInfoPtr> packages) override;
|
| + std::vector<arc::mojom::ArcPackageInfoPtr> packages) override;
|
| void OnTaskOrientationLockRequested(
|
| int32_t task_id,
|
| const arc::mojom::OrientationLock orientation_lock) override;
|
| @@ -336,7 +337,7 @@ class ArcAppListPrefs
|
|
|
| // This checks if app is not registered yet and in this case creates
|
| // non-launchable app entry.
|
| - void MaybeAddNonLaunchableApp(const std::string& name,
|
| + void MaybeAddNonLaunchableApp(const base::Optional<std::string>& name,
|
| const std::string& package_name,
|
| const std::string& activity);
|
|
|
|
|