Rename some AppRegistryCache::DoOnApps vars
This makes the first halves of the "Notify the observers" and the
"Update the states" for loops the same. This makes it clearer that they
iterate over the same things (twice).
BUG=826982
Change-Id: Ia156c0e92d3c8e8cf98e0a517beedd3fe0fedd94
Reviewed-on: https://chromium-review.googlesource.com/c/1401882
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621389}diff --git a/chrome/services/app_service/public/cpp/app_registry_cache.cc b/chrome/services/app_service/public/cpp/app_registry_cache.cc
index 87e709a..d40171c7 100644
--- a/chrome/services/app_service/public/cpp/app_registry_cache.cc
+++ b/chrome/services/app_service/public/cpp/app_registry_cache.cc
@@ -68,9 +68,9 @@
// OnAppUpdate calls back into this AppRegistryCache then we can therefore
// present a single delta for any given app_id.
for (auto& delta : deltas) {
- auto iter = deltas_in_progress_.find(delta->app_id);
- if (iter != deltas_in_progress_.end()) {
- AppUpdate::Merge(iter->second, delta.get());
+ auto d_iter = deltas_in_progress_.find(delta->app_id);
+ if (d_iter != deltas_in_progress_.end()) {
+ AppUpdate::Merge(d_iter->second, delta.get());
} else {
deltas_in_progress_[delta->app_id] = delta.get();
}
@@ -92,13 +92,16 @@
}
// Update the states for every de-duplicated delta.
- for (const auto& delta : deltas_in_progress_) {
- auto iter = states_.find(delta.second->app_id);
- if (iter != states_.end()) {
- AppUpdate::Merge(iter->second.get(), delta.second);
+ for (const auto& d_iter : deltas_in_progress_) {
+ auto s_iter = states_.find(d_iter.first);
+ apps::mojom::App* state =
+ (s_iter != states_.end()) ? s_iter->second.get() : nullptr;
+ apps::mojom::App* delta = d_iter.second;
+
+ if (state) {
+ AppUpdate::Merge(state, delta);
} else {
- states_.insert(
- std::make_pair(delta.second->app_id, delta.second->Clone()));
+ states_.insert(std::make_pair(delta->app_id, delta->Clone()));
}
}
deltas_in_progress_.clear();
