chrome/browser/extensions/settings/syncable_settings_storage.cc - Issue 11826048: Revert 176015

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/extensions/settings/syncable_settings_storage.cc

Issue 11826048: Revert 176015 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 11 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 | Annotate | Revision Log

OLD	NEW
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 "chrome/browser/extensions/settings/syncable_settings_storage.h"	5 #include "chrome/browser/extensions/settings/syncable_settings_storage.h"

6	6

7 #include "chrome/browser/extensions/settings/settings_namespace.h"	7 #include "chrome/browser/extensions/settings/settings_namespace.h"

8 #include "chrome/browser/extensions/settings/settings_sync_processor.h"	8 #include "chrome/browser/extensions/settings/settings_sync_processor.h"

9 #include "chrome/browser/extensions/settings/settings_sync_util.h"	9 #include "chrome/browser/extensions/settings/settings_sync_util.h"

10 #include "content/public/browser/browser_thread.h"	10 #include "content/public/browser/browser_thread.h"

(...skipping 364 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
375 FROM_HERE,	375 FROM_HERE,

376 std::string("Error pushing sync remove to local settings: ") +	376 std::string("Error pushing sync remove to local settings: ") +

377 result->error(),	377 result->error(),

378 sync_processor_->type());	378 sync_processor_->type());

379 }	379 }

380 changes->push_back(ValueStoreChange(key, old_value, NULL));	380 changes->push_back(ValueStoreChange(key, old_value, NULL));

381 return syncer::SyncError();	381 return syncer::SyncError();

382 }	382 }

383	383

384 } // namespace extensions	384 } // namespace extensions

OLD	NEW