Commit d2dac10a authored by nancy's avatar nancy Committed by Commit Bot

Add comments for AppServiceProxy's public interfaces.

When more components use AppService, the public interfaces without
comments could be very confused to use. So add the comments to
AppServiceProxy's public interfaces.

BUG=1016159

Change-Id: Ibf7470a356b15cafccc5def2fd478e79914f5fb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2009594Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733486}
parent c17d9ab3
...@@ -258,23 +258,6 @@ void AppServiceProxy::Uninstall(const std::string& app_id, ...@@ -258,23 +258,6 @@ void AppServiceProxy::Uninstall(const std::string& app_id,
} }
} }
void AppServiceProxy::OnUninstallDialogClosed(
apps::mojom::AppType app_type,
const std::string& app_id,
bool uninstall,
bool clear_site_data,
bool report_abuse,
UninstallDialog* uninstall_dialog) {
if (uninstall) {
app_service_->Uninstall(app_type, app_id, clear_site_data, report_abuse);
}
DCHECK(uninstall_dialog);
auto it = uninstall_dialogs_.find(uninstall_dialog);
DCHECK(it != uninstall_dialogs_.end());
uninstall_dialogs_.erase(it);
}
void AppServiceProxy::PauseApps( void AppServiceProxy::PauseApps(
const std::map<std::string, PauseData>& pause_data) { const std::map<std::string, PauseData>& pause_data) {
if (!app_service_.is_connected()) { if (!app_service_.is_connected()) {
...@@ -311,11 +294,6 @@ void AppServiceProxy::UnpauseApps(const std::set<std::string>& app_ids) { ...@@ -311,11 +294,6 @@ void AppServiceProxy::UnpauseApps(const std::set<std::string>& app_ids) {
} }
} }
void AppServiceProxy::OnPauseDialogClosed(apps::mojom::AppType app_type,
const std::string& app_id) {
app_service_->PauseApp(app_type, app_id);
}
void AppServiceProxy::GetMenuModel(const std::string& app_id, void AppServiceProxy::GetMenuModel(const std::string& app_id,
apps::mojom::MenuType menu_type, apps::mojom::MenuType menu_type,
GetMenuModelCallback callback) { GetMenuModelCallback callback) {
...@@ -477,6 +455,23 @@ void AppServiceProxy::InitializePreferredApps(base::Value preferred_apps) { ...@@ -477,6 +455,23 @@ void AppServiceProxy::InitializePreferredApps(base::Value preferred_apps) {
std::make_unique<base::Value>(std::move(preferred_apps))); std::make_unique<base::Value>(std::move(preferred_apps)));
} }
void AppServiceProxy::OnUninstallDialogClosed(
apps::mojom::AppType app_type,
const std::string& app_id,
bool uninstall,
bool clear_site_data,
bool report_abuse,
UninstallDialog* uninstall_dialog) {
if (uninstall) {
app_service_->Uninstall(app_type, app_id, clear_site_data, report_abuse);
}
DCHECK(uninstall_dialog);
auto it = uninstall_dialogs_.find(uninstall_dialog);
DCHECK(it != uninstall_dialogs_.end());
uninstall_dialogs_.erase(it);
}
void AppServiceProxy::LoadIconForPauseDialog(const apps::AppUpdate& update, void AppServiceProxy::LoadIconForPauseDialog(const apps::AppUpdate& update,
const PauseData& pause_data) { const PauseData& pause_data) {
apps::mojom::IconKeyPtr icon_key = update.IconKey(); apps::mojom::IconKeyPtr icon_key = update.IconKey();
...@@ -522,6 +517,11 @@ void AppServiceProxy::UpdatePausedStatus(apps::mojom::AppType app_type, ...@@ -522,6 +517,11 @@ void AppServiceProxy::UpdatePausedStatus(apps::mojom::AppType app_type,
cache_.OnApps(std::move(apps)); cache_.OnApps(std::move(apps));
} }
void AppServiceProxy::OnPauseDialogClosed(apps::mojom::AppType app_type,
const std::string& app_id) {
app_service_->PauseApp(app_type, app_id);
}
void AppServiceProxy::OnAppUpdate(const apps::AppUpdate& update) { void AppServiceProxy::OnAppUpdate(const apps::AppUpdate& update) {
if (!update.ReadinessChanged() || if (!update.ReadinessChanged() ||
update.Readiness() != apps::mojom::Readiness::kUninstalledByUser) { update.Readiness() != apps::mojom::Readiness::kUninstalledByUser) {
......
...@@ -87,28 +87,42 @@ class AppServiceProxy : public KeyedService, ...@@ -87,28 +87,42 @@ class AppServiceProxy : public KeyedService,
bool allow_placeholder_icon, bool allow_placeholder_icon,
apps::mojom::Publisher::LoadIconCallback callback) override; apps::mojom::Publisher::LoadIconCallback callback) override;
// TODO: Provide comments for public API methods. // Launches the app for the given |app_id|. |event_flags| provides additional
// context about the action which launches the app (e.g. a middle click
// indicating opening a background tab). |launch_source| is the possible app
// launch sources, e.g. from Shelf, from the search box, etc. |display_id| is
// the id of the display from which the app is launched.
// display::kInvalidDisplayId means that the display does not exist or is not
// set.
void Launch(const std::string& app_id, void Launch(const std::string& app_id,
int32_t event_flags, int32_t event_flags,
apps::mojom::LaunchSource launch_source, apps::mojom::LaunchSource launch_source,
int64_t display_id); int64_t display_id);
// Launches an app for the given |app_id|, passing |intent| to the app.
// |launch_source| is the possible app launch sources. |display_id| is the id
// of the display from which the app is launched.
void LaunchAppWithIntent(const std::string& app_id, void LaunchAppWithIntent(const std::string& app_id,
apps::mojom::IntentPtr intent, apps::mojom::IntentPtr intent,
apps::mojom::LaunchSource launch_source, apps::mojom::LaunchSource launch_source,
int64_t display_id); int64_t display_id);
// Launches an app for the given |app_id|, passing |url| to the app.
// |launch_source| is the possible app launch sources. |display_id| is the id
// of the display from which the app is launched.
void LaunchAppWithUrl(const std::string& app_id, void LaunchAppWithUrl(const std::string& app_id,
GURL url, GURL url,
apps::mojom::LaunchSource launch_source, apps::mojom::LaunchSource launch_source,
int64_t display_id); int64_t display_id);
// Sets |permission| for the app identified by |app_id|.
void SetPermission(const std::string& app_id, void SetPermission(const std::string& app_id,
apps::mojom::PermissionPtr permission); apps::mojom::PermissionPtr permission);
// Uninstalls an app for the given |app_id|. If |parent_window| is specified,
// the uninstall dialog will be created as a modal dialog anchored at
// |parent_window|. Otherwise, the browser window will be used as the anchor.
void Uninstall(const std::string& app_id, gfx::NativeWindow parent_window); void Uninstall(const std::string& app_id, gfx::NativeWindow parent_window);
void OnUninstallDialogClosed(apps::mojom::AppType app_type,
const std::string& app_id,
bool uninstall,
bool clear_site_data,
bool report_abuse,
UninstallDialog* uninstall_dialog);
// Pauses apps. |pause_data|'s key is the app_id. |pause_data|'s PauseData // Pauses apps. |pause_data|'s key is the app_id. |pause_data|'s PauseData
// is the time limit setting for the app, which is shown in the pause app // is the time limit setting for the app, which is shown in the pause app
...@@ -121,28 +135,33 @@ class AppServiceProxy : public KeyedService, ...@@ -121,28 +135,33 @@ class AppServiceProxy : public KeyedService,
// as false directly and removes the paused app icon effect. // as false directly and removes the paused app icon effect.
void UnpauseApps(const std::set<std::string>& app_ids); void UnpauseApps(const std::set<std::string>& app_ids);
// Called when the user clicks the 'OK' button of the pause app dialog.
// AppService stops the running app and applies the paused app icon effect.
void OnPauseDialogClosed(apps::mojom::AppType app_type,
const std::string& app_id);
// Returns the menu items for the given |app_id|. // Returns the menu items for the given |app_id|.
void GetMenuModel(const std::string& app_id, void GetMenuModel(const std::string& app_id,
apps::mojom::MenuType menu_type, apps::mojom::MenuType menu_type,
GetMenuModelCallback callback); GetMenuModelCallback callback);
// Opens native settings for the app with |app_id|.
void OpenNativeSettings(const std::string& app_id); void OpenNativeSettings(const std::string& app_id);
void FlushMojoCallsForTesting(); void FlushMojoCallsForTesting();
apps::IconLoader* OverrideInnerIconLoaderForTesting( apps::IconLoader* OverrideInnerIconLoaderForTesting(
apps::IconLoader* icon_loader); apps::IconLoader* icon_loader);
void ReInitializeCrostiniForTesting(Profile* profile); void ReInitializeCrostiniForTesting(Profile* profile);
// Returns a list of apps (represented by their ids) which can handle |url|.
std::vector<std::string> GetAppIdsForUrl(const GURL& url); std::vector<std::string> GetAppIdsForUrl(const GURL& url);
// Returns a list of apps (represented by their ids) which can handle
// |intent|.
std::vector<std::string> GetAppIdsForIntent(apps::mojom::IntentPtr intent); std::vector<std::string> GetAppIdsForIntent(apps::mojom::IntentPtr intent);
// Sets |extension_apps_| and |web_apps_| to observe the ARC apps to set the
// badge on the equivalent Chrome app's icon, when ARC is available.
void SetArcIsRegistered(); void SetArcIsRegistered();
// Add a preferred app for |url|.
// Adds a preferred app for |url|.
void AddPreferredApp(const std::string& app_id, const GURL& url); void AddPreferredApp(const std::string& app_id, const GURL& url);
// Add a preferred app for |intent|. // Adds a preferred app for |intent|.
void AddPreferredApp(const std::string& app_id, void AddPreferredApp(const std::string& app_id,
const apps::mojom::IntentPtr& intent); const apps::mojom::IntentPtr& intent);
...@@ -231,6 +250,20 @@ class AppServiceProxy : public KeyedService, ...@@ -231,6 +250,20 @@ class AppServiceProxy : public KeyedService,
apps::mojom::IntentFilterPtr intent_filter) override; apps::mojom::IntentFilterPtr intent_filter) override;
void InitializePreferredApps(base::Value preferred_apps) override; void InitializePreferredApps(base::Value preferred_apps) override;
// Invoked when the uninstall dialog is closed. The app for the given
// |app_type| and |app_id| will be uninstalled directly if |uninstall| is
// true. |clear_site_data| is available for bookmark apps only. If true, any
// site data associated with the app will be removed. |report_abuse| is
// available for Chrome Apps only. If true, the app will be reported for abuse
// to the Web Store. |uninstall_dialog| will be removed from
// |uninstall_dialogs_|.
void OnUninstallDialogClosed(apps::mojom::AppType app_type,
const std::string& app_id,
bool uninstall,
bool clear_site_data,
bool report_abuse,
UninstallDialog* uninstall_dialog);
void LoadIconForPauseDialog(const apps::AppUpdate& update, void LoadIconForPauseDialog(const apps::AppUpdate& update,
const PauseData& pause_data); const PauseData& pause_data);
...@@ -245,6 +278,11 @@ class AppServiceProxy : public KeyedService, ...@@ -245,6 +278,11 @@ class AppServiceProxy : public KeyedService,
const std::string& app_id, const std::string& app_id,
bool paused); bool paused);
// Invoked when the user clicks the 'OK' button of the pause app dialog.
// AppService stops the running app and applies the paused app icon effect.
void OnPauseDialogClosed(apps::mojom::AppType app_type,
const std::string& app_id);
// apps::AppRegistryCache::Observer overrides: // apps::AppRegistryCache::Observer overrides:
void OnAppUpdate(const apps::AppUpdate& update) override; void OnAppUpdate(const apps::AppUpdate& update) override;
void OnAppRegistryCacheWillBeDestroyed( void OnAppRegistryCacheWillBeDestroyed(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment