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

Unified Diff: chrome/browser/sync/glue/device_info.cc

Issue 597423002: Device info datatype should be moved to components/sync_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor CR feedback addressed. Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/glue/device_info.h ('k') | chrome/browser/sync/glue/device_info_data_type_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/device_info.cc
diff --git a/chrome/browser/sync/glue/device_info.cc b/chrome/browser/sync/glue/device_info.cc
deleted file mode 100644
index 8d07eeabd293ff94b5a1067390717c36359979db..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/glue/device_info.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/values.h"
-#include "chrome/browser/sync/glue/device_info.h"
-#include "content/public/browser/browser_thread.h"
-#include "sync/util/get_session_name.h"
-
-namespace browser_sync {
-
-DeviceInfo::DeviceInfo(const std::string& guid,
- const std::string& client_name,
- const std::string& chrome_version,
- const std::string& sync_user_agent,
- const sync_pb::SyncEnums::DeviceType device_type,
- const std::string& signin_scoped_device_id)
- : guid_(guid),
- client_name_(client_name),
- chrome_version_(chrome_version),
- sync_user_agent_(sync_user_agent),
- device_type_(device_type),
- signin_scoped_device_id_(signin_scoped_device_id) {
-}
-
-DeviceInfo::~DeviceInfo() { }
-
-const std::string& DeviceInfo::guid() const {
- return guid_;
-}
-
-const std::string& DeviceInfo::client_name() const {
- return client_name_;
-}
-
-const std::string& DeviceInfo::chrome_version() const {
- return chrome_version_;
-}
-
-const std::string& DeviceInfo::sync_user_agent() const {
- return sync_user_agent_;
-}
-
-const std::string& DeviceInfo::public_id() const {
- return public_id_;
-}
-
-sync_pb::SyncEnums::DeviceType DeviceInfo::device_type() const {
- return device_type_;
-}
-
-const std::string& DeviceInfo::signin_scoped_device_id() const {
- return signin_scoped_device_id_;
-}
-
-std::string DeviceInfo::GetOSString() const {
- switch (device_type_) {
- case sync_pb::SyncEnums_DeviceType_TYPE_WIN:
- return "win";
- case sync_pb::SyncEnums_DeviceType_TYPE_MAC:
- return "mac";
- case sync_pb::SyncEnums_DeviceType_TYPE_LINUX:
- return "linux";
- case sync_pb::SyncEnums_DeviceType_TYPE_CROS:
- return "chrome_os";
- case sync_pb::SyncEnums_DeviceType_TYPE_PHONE:
- case sync_pb::SyncEnums_DeviceType_TYPE_TABLET:
- // TODO(lipalani): crbug.com/170375. Add support for ios
- // phones and tablets.
- return "android";
- default:
- return "unknown";
- }
-}
-
-std::string DeviceInfo::GetDeviceTypeString() const {
- switch (device_type_) {
- case sync_pb::SyncEnums_DeviceType_TYPE_WIN:
- case sync_pb::SyncEnums_DeviceType_TYPE_MAC:
- case sync_pb::SyncEnums_DeviceType_TYPE_LINUX:
- case sync_pb::SyncEnums_DeviceType_TYPE_CROS:
- return "desktop_or_laptop";
- case sync_pb::SyncEnums_DeviceType_TYPE_PHONE:
- return "phone";
- case sync_pb::SyncEnums_DeviceType_TYPE_TABLET:
- return "tablet";
- default:
- return "unknown";
- }
-}
-
-bool DeviceInfo::Equals(const DeviceInfo& other) const {
- return this->guid() == other.guid() &&
- this->client_name() == other.client_name() &&
- this->chrome_version() == other.chrome_version() &&
- this->sync_user_agent() == other.sync_user_agent() &&
- this->device_type() == other.device_type() &&
- this->signin_scoped_device_id() == other.signin_scoped_device_id();
-}
-
-base::DictionaryValue* DeviceInfo::ToValue() {
- base::DictionaryValue* value = new base::DictionaryValue();
- value->SetString("name", client_name_);
- value->SetString("id", public_id_);
- value->SetString("os", GetOSString());
- value->SetString("type", GetDeviceTypeString());
- value->SetString("chromeVersion", chrome_version_);
- return value;
-}
-
-void DeviceInfo::set_public_id(std::string id) {
- public_id_ = id;
-}
-
-// static.
-void DeviceInfo::GetClientName(const GetClientNameCallback& callback) {
- syncer::GetSessionName(content::BrowserThread::GetBlockingPool(), callback);
-}
-
-} // namespace browser_sync
« no previous file with comments | « chrome/browser/sync/glue/device_info.h ('k') | chrome/browser/sync/glue/device_info_data_type_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698