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

Side by Side Diff: chrome/browser/prefs/pref_model_associator.cc

Issue 7879006: Delete Tracked, and move Location to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 9 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/prefs/pref_model_associator.h" 5 #include "chrome/browser/prefs/pref_model_associator.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/location.h"
9 #include "base/logging.h" 10 #include "base/logging.h"
10 #include "base/tracked.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/sync/api/sync_change.h" 13 #include "chrome/browser/sync/api/sync_change.h"
14 #include "chrome/browser/sync/protocol/preference_specifics.pb.h" 14 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"
15 #include "chrome/common/chrome_notification_types.h" 15 #include "chrome/common/chrome_notification_types.h"
16 #include "chrome/common/pref_names.h" 16 #include "chrome/common/pref_names.h"
17 #include "content/common/json_value_serializer.h" 17 #include "content/common/json_value_serializer.h"
18 #include "content/common/notification_service.h" 18 #include "content/common/notification_service.h"
19 19
20 using syncable::PREFERENCES; 20 using syncable::PREFERENCES;
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 return; 441 return;
442 } 442 }
443 changes.push_back(SyncChange(SyncChange::ACTION_UPDATE, sync_data)); 443 changes.push_back(SyncChange(SyncChange::ACTION_UPDATE, sync_data));
444 } 444 }
445 445
446 SyncError error = 446 SyncError error =
447 sync_processor_->ProcessSyncChanges(FROM_HERE, changes); 447 sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
448 if (error.IsSet()) 448 if (error.IsSet())
449 StopSyncing(PREFERENCES); 449 StopSyncing(PREFERENCES);
450 } 450 }
OLDNEW
« no previous file with comments | « chrome/browser/metrics/metrics_reporting_scheduler.h ('k') | chrome/browser/sync/abstract_profile_sync_service_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698