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

Side by Side Diff: chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc

Issue 2416763002: Replace FOR_EACH_OBSERVER in c/b/chromeos with range-based for (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" 5 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/chromeos/login/screens/user_image_screen.h" 9 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
10 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 10 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 void UserImageSyncObserver::OnInitialSync() { 99 void UserImageSyncObserver::OnInitialSync() {
100 int synced_index; 100 int synced_index;
101 bool local_image_updated = false; 101 bool local_image_updated = false;
102 if (!GetSyncedImageIndex(&synced_index) || local_image_changed_) { 102 if (!GetSyncedImageIndex(&synced_index) || local_image_changed_) {
103 UpdateSyncedImageFromLocal(); 103 UpdateSyncedImageFromLocal();
104 } else if (IsIndexSupported(synced_index) && CanUpdateLocalImageNow()) { 104 } else if (IsIndexSupported(synced_index) && CanUpdateLocalImageNow()) {
105 UpdateLocalImageFromSynced(); 105 UpdateLocalImageFromSynced();
106 local_image_updated = true; 106 local_image_updated = true;
107 } 107 }
108 FOR_EACH_OBSERVER(UserImageSyncObserver::Observer, observer_list_, 108 for (auto& observer : observer_list_)
109 OnInitialSync(local_image_updated)); 109 observer.OnInitialSync(local_image_updated);
110 } 110 }
111 111
112 void UserImageSyncObserver::OnPreferenceChanged(const std::string& pref_name) { 112 void UserImageSyncObserver::OnPreferenceChanged(const std::string& pref_name) {
113 // OnPreferenceChanged can be called before OnIsSyncingChanged. 113 // OnPreferenceChanged can be called before OnIsSyncingChanged.
114 if (!is_synced_) { 114 if (!is_synced_) {
115 is_synced_ = true; 115 is_synced_ = true;
116 prefs_->RemoveObserver(this); 116 prefs_->RemoveObserver(this);
117 OnInitialSync(); 117 OnInitialSync();
118 } else if (CanUpdateLocalImageNow()) { 118 } else if (CanUpdateLocalImageNow()) {
119 UpdateLocalImageFromSynced(); 119 UpdateLocalImageFromSynced();
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 UserImageScreen* screen = UserImageScreen::Get(wizard_controller); 192 UserImageScreen* screen = UserImageScreen::Get(wizard_controller);
193 if (wizard_controller->current_screen() == screen) { 193 if (wizard_controller->current_screen() == screen) {
194 if (screen->user_selected_image()) 194 if (screen->user_selected_image())
195 return false; 195 return false;
196 } 196 }
197 } 197 }
198 return true; 198 return true;
199 } 199 }
200 200
201 } // namespace chromeos 201 } // namespace chromeos
202
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698