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

Side by Side Diff: components/filesystem/public/cpp/prefs/filesystem_json_pref_store.cc

Issue 2440303002: Remove usage of FOR_EACH_OBSERVER macro in components/ (Closed)
Patch Set: remove superfluous return Created 4 years, 1 month 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
« no previous file with comments | « components/favicon/core/favicon_driver.cc ('k') | components/gcm_driver/gcm_driver_desktop.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "components/filesystem/public/cpp/prefs/filesystem_json_pref_store.h" 5 #include "components/filesystem/public/cpp/prefs/filesystem_json_pref_store.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 PerformWrite(); 222 PerformWrite();
223 } 223 }
224 224
225 void FilesystemJsonPrefStore::ReportValueChanged(const std::string& key, 225 void FilesystemJsonPrefStore::ReportValueChanged(const std::string& key,
226 uint32_t flags) { 226 uint32_t flags) {
227 DCHECK(CalledOnValidThread()); 227 DCHECK(CalledOnValidThread());
228 228
229 if (pref_filter_) 229 if (pref_filter_)
230 pref_filter_->FilterUpdate(key); 230 pref_filter_->FilterUpdate(key);
231 231
232 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, OnPrefValueChanged(key)); 232 for (PrefStore::Observer& observer : observers_)
233 observer.OnPrefValueChanged(key);
233 234
234 ScheduleWrite(flags); 235 ScheduleWrite(flags);
235 } 236 }
236 237
237 void FilesystemJsonPrefStore::OnFileSystemShutdown() {} 238 void FilesystemJsonPrefStore::OnFileSystemShutdown() {}
238 239
239 void FilesystemJsonPrefStore::OnFileRead( 240 void FilesystemJsonPrefStore::OnFileRead(
240 std::unique_ptr<ReadResult> read_result) { 241 std::unique_ptr<ReadResult> read_result) {
241 DCHECK(CalledOnValidThread()); 242 DCHECK(CalledOnValidThread());
242 243
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 prefs_ = std::move(prefs); 302 prefs_ = std::move(prefs);
302 303
303 initialized_ = true; 304 initialized_ = true;
304 305
305 if (schedule_write) 306 if (schedule_write)
306 ScheduleWrite(DEFAULT_PREF_WRITE_FLAGS); 307 ScheduleWrite(DEFAULT_PREF_WRITE_FLAGS);
307 308
308 if (error_delegate_ && read_error_ != PREF_READ_ERROR_NONE) 309 if (error_delegate_ && read_error_ != PREF_READ_ERROR_NONE)
309 error_delegate_->OnError(read_error_); 310 error_delegate_->OnError(read_error_);
310 311
311 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, 312 for (PrefStore::Observer& observer : observers_)
312 OnInitializationCompleted(true)); 313 observer.OnInitializationCompleted(true);
313
314 return;
315 } 314 }
316 315
317 void FilesystemJsonPrefStore::ScheduleWrite(uint32_t flags) { 316 void FilesystemJsonPrefStore::ScheduleWrite(uint32_t flags) {
318 if (read_only_) 317 if (read_only_)
319 return; 318 return;
320 319
321 if (flags & LOSSY_PREF_WRITE_FLAG) 320 if (flags & LOSSY_PREF_WRITE_FLAG)
322 pending_lossy_write_ = true; 321 pending_lossy_write_ = true;
323 else 322 else
324 PerformWrite(); 323 PerformWrite();
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 reinterpret_cast<char*>(&contents.front()), contents.size())); 416 reinterpret_cast<char*>(&contents.front()), contents.size()));
418 read_result->value = deserializer.Deserialize(&error_code, &error_msg); 417 read_result->value = deserializer.Deserialize(&error_code, &error_msg);
419 read_result->error = HandleReadErrors(read_result->value.get()); 418 read_result->error = HandleReadErrors(read_result->value.get());
420 } 419 }
421 } 420 }
422 421
423 OnFileRead(std::move(read_result)); 422 OnFileRead(std::move(read_result));
424 } 423 }
425 424
426 } // namespace filesystem 425 } // namespace filesystem
OLDNEW
« no previous file with comments | « components/favicon/core/favicon_driver.cc ('k') | components/gcm_driver/gcm_driver_desktop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698