chrome/browser/chromeos/settings/device_settings_provider.cc - Issue 10950032: Fix queued writes in DeviceSettingsProvider.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/settings/device_settings_provider.cc

Issue 10950032: Fix queued writes in DeviceSettingsProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove redundant EXPECT_CALL. Created 8 years, 3 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:

Index: chrome/browser/chromeos/settings/device_settings_provider.cc

diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc

index 1a6b56b82dc0e0600d543c4984a551a4be39758e..1a8034b5590fb53f2f5ab6b9255bb2034ec0658a 100644

--- a/chrome/browser/chromeos/settings/device_settings_provider.cc

+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc

@@ -658,11 +658,8 @@ void DeviceSettingsProvider::UpdateAndProceedStoring() {

UpdateFromService();

// Trigger the next change if necessary.

- if (trusted_status_ == TRUSTED &&

- !store_callback_factory_.HasWeakPtrs() &&

- !pending_changes_.empty()) {

+ if (trusted_status_ == TRUSTED && !pending_changes_.empty())

SetInPolicy();

- }

}

bool DeviceSettingsProvider::UpdateFromService() {

« no previous file with comments | « no previous file | chrome/browser/chromeos/settings/device_settings_provider_unittest.cc » ('j') | no next file with comments »