Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(472)

Unified Diff: chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc

Issue 2416633002: Remove FOR_EACH_OBSERVER from arc/ since it's being deprecated (Closed)
Patch Set: remove braces Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
diff --git a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
index 3838a23cbd8ed70d880d7d04d4fd699504629c13..374344a90ce8884a58810d63a92f9e890f2eca3c 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
@@ -359,9 +359,8 @@ void ArcAppListPrefs::SetNotificationsEnabled(const std::string& app_id,
// In case app is not ready, defer this request.
if (!ready_apps_.count(app_id)) {
SetNotificationsEnabledDeferred(prefs_).Put(app_id, enabled);
- FOR_EACH_OBSERVER(
- Observer, observer_list_,
- OnNotificationsEnabledChanged(app_info->package_name, enabled));
+ for (auto& observer : observer_list_)
+ observer.OnNotificationsEnabledChanged(app_info->package_name, enabled);
return;
}
@@ -547,8 +546,8 @@ void ArcAppListPrefs::DisableAllApps() {
std::unordered_set<std::string> old_ready_apps;
old_ready_apps.swap(ready_apps_);
for (auto& app_id : old_ready_apps) {
- FOR_EACH_OBSERVER(Observer, observer_list_,
- OnAppReadyChanged(app_id, false));
+ for (auto& observer : observer_list_)
+ observer.OnAppReadyChanged(app_id, false);
}
}
@@ -567,8 +566,8 @@ void ArcAppListPrefs::NotifyRegisteredApps() {
// Default apps are reported earlier.
if (default_apps_.HasApp(app_id))
continue;
- FOR_EACH_OBSERVER(Observer, observer_list_,
- OnAppRegistered(app_id, *app_info));
+ for (auto& observer : observer_list_)
+ observer.OnAppRegistered(app_id, *app_info);
}
apps_restored_ = true;
@@ -582,8 +581,8 @@ void ArcAppListPrefs::RemoveAllApps() {
} else {
if (ready_apps_.count(app_id)) {
ready_apps_.erase(app_id);
- FOR_EACH_OBSERVER(Observer, observer_list_,
- OnAppReadyChanged(app_id, false));
+ for (auto& observer : observer_list_)
+ observer.OnAppReadyChanged(app_id, false);
}
}
}
@@ -729,8 +728,8 @@ void ArcAppListPrefs::AddAppAndShortcut(
DCHECK(app_old_info);
DCHECK(launchable);
if (updated_name != app_old_info->name) {
- FOR_EACH_OBSERVER(Observer, observer_list_,
- OnAppNameUpdated(app_id, updated_name));
+ for (auto& observer : observer_list_)
+ observer.OnAppNameUpdated(app_id, updated_name);
}
}
@@ -762,8 +761,8 @@ void ArcAppListPrefs::AddAppAndShortcut(
if (was_registered) {
if (was_disabled && app_ready) {
- FOR_EACH_OBSERVER(Observer, observer_list_,
- OnAppReadyChanged(app_id, true));
+ for (auto& observer : observer_list_)
+ observer.OnAppReadyChanged(app_id, true);
}
} else {
AppInfo app_info(updated_name, package_name, activity, intent_uri,
@@ -771,9 +770,8 @@ void ArcAppListPrefs::AddAppAndShortcut(
sticky, notifications_enabled, true,
launchable && arc::ShouldShowInLauncher(app_id), shortcut,
launchable, orientation_lock);
- FOR_EACH_OBSERVER(Observer,
- observer_list_,
- OnAppRegistered(app_id, app_info));
+ for (auto& observer : observer_list_)
+ observer.OnAppRegistered(app_id, app_info);
}
if (app_ready) {
@@ -816,7 +814,8 @@ void ArcAppListPrefs::RemoveApp(const std::string& app_id) {
const bool removed = apps->Remove(app_id, nullptr);
DCHECK(removed);
- FOR_EACH_OBSERVER(Observer, observer_list_, OnAppRemoved(app_id));
+ for (auto& observer : observer_list_)
+ observer.OnAppRemoved(app_id);
// Remove local data on file system.
content::BrowserThread::GetBlockingPool()->PostTask(
@@ -908,8 +907,8 @@ void ArcAppListPrefs::OnAppListRefreshed(
void ArcAppListPrefs::OnTaskOrientationLockRequested(
int32_t task_id,
const arc::mojom::OrientationLock orientation_lock) {
- FOR_EACH_OBSERVER(Observer, observer_list_,
- OnTaskOrientationLockRequested(task_id, orientation_lock));
+ for (auto& observer : observer_list_)
+ observer.OnTaskOrientationLockRequested(task_id, orientation_lock);
}
void ArcAppListPrefs::AddApp(const arc::mojom::AppInfo& app_info) {
@@ -1009,7 +1008,8 @@ void ArcAppListPrefs::OnPackageRemoved(const mojo::String& package_name) {
RemoveApp(app_id);
RemovePackageFromPrefs(prefs_, package_name);
- FOR_EACH_OBSERVER(Observer, observer_list_, OnPackageRemoved(package_name));
+ for (auto& observer : observer_list_)
+ observer.OnPackageRemoved(package_name);
}
void ArcAppListPrefs::OnAppIcon(const mojo::String& package_name,
@@ -1049,16 +1049,18 @@ void ArcAppListPrefs::OnTaskCreated(int32_t task_id,
const mojo::String& activity,
const mojo::String& name) {
MaybeAddNonLaunchableApp(name, package_name, activity);
- FOR_EACH_OBSERVER(Observer, observer_list_,
- OnTaskCreated(task_id, package_name, activity));
+ for (auto& observer : observer_list_)
+ observer.OnTaskCreated(task_id, package_name, activity);
}
void ArcAppListPrefs::OnTaskDestroyed(int32_t task_id) {
- FOR_EACH_OBSERVER(Observer, observer_list_, OnTaskDestroyed(task_id));
+ for (auto& observer : observer_list_)
+ observer.OnTaskDestroyed(task_id);
}
void ArcAppListPrefs::OnTaskSetActive(int32_t task_id) {
- FOR_EACH_OBSERVER(Observer, observer_list_, OnTaskSetActive(task_id));
+ for (auto& observer : observer_list_)
+ observer.OnTaskSetActive(task_id);
}
void ArcAppListPrefs::OnNotificationsEnabledChanged(
@@ -1081,8 +1083,8 @@ void ArcAppListPrefs::OnNotificationsEnabledChanged(
base::DictionaryValue* updateing_app_dict = update.Get();
updateing_app_dict->SetBoolean(kNotificationsEnabled, enabled);
}
- FOR_EACH_OBSERVER(Observer, observer_list_,
- OnNotificationsEnabledChanged(package_name, enabled));
+ for (auto& observer : observer_list_)
+ observer.OnNotificationsEnabledChanged(package_name, enabled);
}
void ArcAppListPrefs::MaybeShowPackageInAppLauncher(
@@ -1119,8 +1121,8 @@ void ArcAppListPrefs::OnPackageAdded(
!sync_service_->IsPackageSyncing(package_info->package_name);
AddOrUpdatePackagePrefs(prefs_, *package_info);
- FOR_EACH_OBSERVER(Observer, observer_list_,
- OnPackageInstalled(*package_info));
+ for (auto& observer : observer_list_)
+ observer.OnPackageInstalled(*package_info);
if (new_package_in_system)
MaybeShowPackageInAppLauncher(*package_info);
}
@@ -1129,7 +1131,8 @@ void ArcAppListPrefs::OnPackageModified(
arc::mojom::ArcPackageInfoPtr package_info) {
DCHECK(IsArcEnabled());
AddOrUpdatePackagePrefs(prefs_, *package_info);
- FOR_EACH_OBSERVER(Observer, observer_list_, OnPackageModified(*package_info));
+ for (auto& observer : observer_list_)
+ observer.OnPackageModified(*package_info);
}
void ArcAppListPrefs::OnPackageListRefreshed(
@@ -1155,7 +1158,8 @@ void ArcAppListPrefs::OnPackageListRefreshed(
return;
package_list_initial_refreshed_ = true;
- FOR_EACH_OBSERVER(Observer, observer_list_, OnPackageListInitialRefreshed());
+ for (auto& observer : observer_list_)
+ observer.OnPackageListInitialRefreshed();
}
std::vector<std::string> ArcAppListPrefs::GetPackagesFromPrefs() const {
@@ -1218,8 +1222,8 @@ void ArcAppListPrefs::OnIconInstalled(const std::string& app_id,
if (!install_succeed)
return;
- FOR_EACH_OBSERVER(Observer, observer_list_,
- OnAppIconUpdated(app_id, scale_factor));
+ for (auto& observer : observer_list_)
+ observer.OnAppIconUpdated(app_id, scale_factor);
}
ArcAppListPrefs::AppInfo::AppInfo(const std::string& name,

Powered by Google App Engine
This is Rietveld 408576698