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

Side by Side Diff: components/sync/driver/sync_prefs.cc

Issue 2306763002: Add PrinterSpecifics to the sync protos. (Closed)
Patch Set: PrintersSpecifics -> PrinterSpecifics Created 4 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
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/sync/driver/sync_prefs.h" 5 #include "components/sync/driver/sync_prefs.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 case syncer::SUPERVISED_USER_SHARED_SETTINGS: 313 case syncer::SUPERVISED_USER_SHARED_SETTINGS:
314 return prefs::kSyncSupervisedUserSharedSettings; 314 return prefs::kSyncSupervisedUserSharedSettings;
315 case syncer::SUPERVISED_USER_WHITELISTS: 315 case syncer::SUPERVISED_USER_WHITELISTS:
316 return prefs::kSyncSupervisedUserWhitelists; 316 return prefs::kSyncSupervisedUserWhitelists;
317 case syncer::DEVICE_INFO: 317 case syncer::DEVICE_INFO:
318 return prefs::kSyncDeviceInfo; 318 return prefs::kSyncDeviceInfo;
319 case syncer::WIFI_CREDENTIALS: 319 case syncer::WIFI_CREDENTIALS:
320 return prefs::kSyncWifiCredentials; 320 return prefs::kSyncWifiCredentials;
321 case syncer::ARC_PACKAGE: 321 case syncer::ARC_PACKAGE:
322 return prefs::kSyncArcPackage; 322 return prefs::kSyncArcPackage;
323 case syncer::PRINTERS:
324 return prefs::kSyncPrinters;
323 default: 325 default:
324 break; 326 break;
325 } 327 }
326 NOTREACHED() << "Type is " << data_type; 328 NOTREACHED() << "Type is " << data_type;
327 return NULL; 329 return NULL;
328 } 330 }
329 331
330 #if defined(OS_CHROMEOS) 332 #if defined(OS_CHROMEOS)
331 std::string SyncPrefs::GetSpareBootstrapToken() const { 333 std::string SyncPrefs::GetSpareBootstrapToken() const {
332 DCHECK(CalledOnValidThread()); 334 DCHECK(CalledOnValidThread());
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>(); 549 return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>();
548 550
549 std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState> result( 551 std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState> result(
550 new syncer::SyncEncryptionHandler::NigoriState()); 552 new syncer::SyncEncryptionHandler::NigoriState());
551 if (!result->nigori_specifics.ParseFromString(decoded)) 553 if (!result->nigori_specifics.ParseFromString(decoded))
552 return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>(); 554 return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>();
553 return result; 555 return result;
554 } 556 }
555 557
556 } // namespace sync_driver 558 } // namespace sync_driver
OLDNEW
« no previous file with comments | « components/sync/driver/pref_names.cc ('k') | components/sync/driver/user_selectable_sync_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698