Commit 55f44515 authored by nancy's avatar nancy Committed by Commit Bot

Add understcore for pause_app variable.

BUG=1011235

Change-Id: If02b98bc31ca2ae9d5717bc0ebffa04cc5562b2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1919538Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#716057}
parent 6b0537ea
...@@ -417,22 +417,22 @@ void ArcApps::Uninstall(const std::string& app_id, ...@@ -417,22 +417,22 @@ void ArcApps::Uninstall(const std::string& app_id,
} }
void ArcApps::PauseApp(const std::string& app_id) { void ArcApps::PauseApp(const std::string& app_id) {
if (paused_apps.find(app_id) != paused_apps.end()) { if (paused_apps_.find(app_id) != paused_apps_.end()) {
return; return;
} }
paused_apps.insert(app_id); paused_apps_.insert(app_id);
SetIconEffect(app_id); SetIconEffect(app_id);
// TODO(crbug.com/1011235): If the app is running, Stop the app. // TODO(crbug.com/1011235): If the app is running, Stop the app.
} }
void ArcApps::UnpauseApps(const std::string& app_id) { void ArcApps::UnpauseApps(const std::string& app_id) {
if (paused_apps.find(app_id) == paused_apps.end()) { if (paused_apps_.find(app_id) == paused_apps_.end()) {
return; return;
} }
paused_apps.erase(app_id); paused_apps_.erase(app_id);
SetIconEffect(app_id); SetIconEffect(app_id);
} }
...@@ -545,7 +545,7 @@ void ArcApps::OnAppStatesChanged(const std::string& app_id, ...@@ -545,7 +545,7 @@ void ArcApps::OnAppStatesChanged(const std::string& app_id,
} }
void ArcApps::OnAppRemoved(const std::string& app_id) { void ArcApps::OnAppRemoved(const std::string& app_id) {
paused_apps.erase(app_id); paused_apps_.erase(app_id);
apps::mojom::AppPtr app = apps::mojom::App::New(); apps::mojom::AppPtr app = apps::mojom::App::New();
app->app_type = apps::mojom::AppType::kArc; app->app_type = apps::mojom::AppType::kArc;
...@@ -790,7 +790,7 @@ void ArcApps::SetIconEffect(const std::string& app_id) { ...@@ -790,7 +790,7 @@ void ArcApps::SetIconEffect(const std::string& app_id) {
if (app_info->suspended) { if (app_info->suspended) {
icon_effects = static_cast<IconEffects>(icon_effects | IconEffects::kGray); icon_effects = static_cast<IconEffects>(icon_effects | IconEffects::kGray);
} }
if (paused_apps.find(app_id) != paused_apps.end()) { if (paused_apps_.find(app_id) != paused_apps_.end()) {
icon_effects = icon_effects =
static_cast<IconEffects>(icon_effects | IconEffects::kPaused); static_cast<IconEffects>(icon_effects | IconEffects::kPaused);
} }
......
...@@ -132,7 +132,7 @@ class ArcApps : public KeyedService, ...@@ -132,7 +132,7 @@ class ArcApps : public KeyedService,
apps_util::IncrementingIconKeyFactory icon_key_factory_; apps_util::IncrementingIconKeyFactory icon_key_factory_;
std::set<std::string> paused_apps; std::set<std::string> paused_apps_;
ScopedObserver<arc::ArcIntentHelperBridge, arc::ArcIntentHelperObserver> ScopedObserver<arc::ArcIntentHelperBridge, arc::ArcIntentHelperObserver>
arc_intent_helper_observer_{this}; arc_intent_helper_observer_{this};
......
...@@ -553,22 +553,22 @@ void ExtensionApps::Uninstall(const std::string& app_id, ...@@ -553,22 +553,22 @@ void ExtensionApps::Uninstall(const std::string& app_id,
} }
void ExtensionApps::PauseApp(const std::string& app_id) { void ExtensionApps::PauseApp(const std::string& app_id) {
if (paused_apps.find(app_id) != paused_apps.end()) { if (paused_apps_.find(app_id) != paused_apps_.end()) {
return; return;
} }
paused_apps.insert(app_id); paused_apps_.insert(app_id);
SetIconEffect(app_id); SetIconEffect(app_id);
// TODO(crbug.com/1011235): If the app is running, Stop the app. // TODO(crbug.com/1011235): If the app is running, Stop the app.
} }
void ExtensionApps::UnpauseApps(const std::string& app_id) { void ExtensionApps::UnpauseApps(const std::string& app_id) {
if (paused_apps.find(app_id) == paused_apps.end()) { if (paused_apps_.find(app_id) == paused_apps_.end()) {
return; return;
} }
paused_apps.erase(app_id); paused_apps_.erase(app_id);
SetIconEffect(app_id); SetIconEffect(app_id);
} }
...@@ -761,7 +761,7 @@ void ExtensionApps::OnExtensionUninstalled( ...@@ -761,7 +761,7 @@ void ExtensionApps::OnExtensionUninstalled(
} }
enable_flow_map_.erase(extension->id()); enable_flow_map_.erase(extension->id());
paused_apps.erase(extension->id()); paused_apps_.erase(extension->id());
// Construct an App with only the information required to identify an // Construct an App with only the information required to identify an
// uninstallation. // uninstallation.
...@@ -1067,7 +1067,7 @@ IconEffects ExtensionApps::GetIconEffects( ...@@ -1067,7 +1067,7 @@ IconEffects ExtensionApps::GetIconEffects(
icon_effects = icon_effects =
static_cast<IconEffects>(icon_effects | IconEffects::kRoundCorners); static_cast<IconEffects>(icon_effects | IconEffects::kRoundCorners);
} }
if (paused_apps.find(extension->id()) != paused_apps.end()) { if (paused_apps_.find(extension->id()) != paused_apps_.end()) {
icon_effects = icon_effects =
static_cast<IconEffects>(icon_effects | IconEffects::kPaused); static_cast<IconEffects>(icon_effects | IconEffects::kPaused);
} }
......
...@@ -210,7 +210,7 @@ class ExtensionApps : public apps::mojom::Publisher, ...@@ -210,7 +210,7 @@ class ExtensionApps : public apps::mojom::Publisher,
using EnableFlowPtr = std::unique_ptr<ExtensionAppsEnableFlow>; using EnableFlowPtr = std::unique_ptr<ExtensionAppsEnableFlow>;
std::map<std::string, EnableFlowPtr> enable_flow_map_; std::map<std::string, EnableFlowPtr> enable_flow_map_;
std::set<std::string> paused_apps; std::set<std::string> paused_apps_;
ArcAppListPrefs* arc_prefs_ = nullptr; ArcAppListPrefs* arc_prefs_ = nullptr;
......
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