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

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

Issue 1397913002: [Sync] Componentize local_device_info_provider_impl and test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android Created 5 years, 2 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
Index: chrome/browser/sync/glue/local_device_info_provider_impl.cc
diff --git a/chrome/browser/sync/glue/local_device_info_provider_impl.cc b/chrome/browser/sync/glue/local_device_info_provider_impl.cc
deleted file mode 100644
index 282814bcad3c4ff4dce91926570570e7ef09277c..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/glue/local_device_info_provider_impl.cc
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2014 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/bind.h"
-#include "chrome/browser/sync/glue/local_device_info_provider_impl.h"
-#include "chrome/common/channel_info.h"
-#include "components/sync_driver/sync_util.h"
-#include "content/public/browser/browser_thread.h"
-#include "sync/util/get_session_name.h"
-#include "ui/base/device_form_factor.h"
-
-namespace browser_sync {
-
-namespace {
-
-#if defined(OS_ANDROID)
-bool IsTabletUI() {
- return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET;
-}
-#endif
-
-sync_pb::SyncEnums::DeviceType GetLocalDeviceType() {
-#if defined(OS_CHROMEOS)
- return sync_pb::SyncEnums_DeviceType_TYPE_CROS;
-#elif defined(OS_LINUX)
- return sync_pb::SyncEnums_DeviceType_TYPE_LINUX;
-#elif defined(OS_MACOSX)
- return sync_pb::SyncEnums_DeviceType_TYPE_MAC;
-#elif defined(OS_WIN)
- return sync_pb::SyncEnums_DeviceType_TYPE_WIN;
-#elif defined(OS_ANDROID)
- return IsTabletUI() ? sync_pb::SyncEnums_DeviceType_TYPE_TABLET
- : sync_pb::SyncEnums_DeviceType_TYPE_PHONE;
-#else
- return sync_pb::SyncEnums_DeviceType_TYPE_OTHER;
-#endif
-}
-
-} // namespace
-
-LocalDeviceInfoProviderImpl::LocalDeviceInfoProviderImpl()
- : weak_factory_(this) {
-}
-
-LocalDeviceInfoProviderImpl::~LocalDeviceInfoProviderImpl() {
-}
-
-const sync_driver::DeviceInfo*
-LocalDeviceInfoProviderImpl::GetLocalDeviceInfo() const {
- return local_device_info_.get();
-}
-
-std::string LocalDeviceInfoProviderImpl::GetSyncUserAgent() const {
-#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
- return MakeDesktopUserAgentForSync(chrome::GetChannel());
-#elif defined(OS_CHROMEOS)
- return MakeUserAgentForSync("CROS ", chrome::GetChannel());
-#elif defined(OS_ANDROID)
- if (IsTabletUI()) {
- return MakeUserAgentForSync("ANDROID-TABLET ", chrome::GetChannel());
- } else {
- return MakeUserAgentForSync("ANDROID-PHONE ", chrome::GetChannel());
- }
-#endif
-}
-
-std::string LocalDeviceInfoProviderImpl::GetLocalSyncCacheGUID() const {
- return cache_guid_;
-}
-
-scoped_ptr<sync_driver::LocalDeviceInfoProvider::Subscription>
-LocalDeviceInfoProviderImpl::RegisterOnInitializedCallback(
- const base::Closure& callback) {
- DCHECK(!local_device_info_.get());
- return callback_list_.Add(callback);
-}
-
-void LocalDeviceInfoProviderImpl::Initialize(
- const std::string& cache_guid, const std::string& signin_scoped_device_id) {
- DCHECK(!cache_guid.empty());
- cache_guid_ = cache_guid;
-
- syncer::GetSessionName(
- content::BrowserThread::GetBlockingPool(),
- base::Bind(&LocalDeviceInfoProviderImpl::InitializeContinuation,
- weak_factory_.GetWeakPtr(),
- cache_guid,
- signin_scoped_device_id));
-}
-
-void LocalDeviceInfoProviderImpl::InitializeContinuation(
- const std::string& guid,
- const std::string& signin_scoped_device_id,
- const std::string& session_name) {
- local_device_info_.reset(
- new sync_driver::DeviceInfo(guid,
- session_name,
- chrome::GetVersionString(),
- GetSyncUserAgent(),
- GetLocalDeviceType(),
- signin_scoped_device_id));
-
- // Notify observers.
- callback_list_.Notify();
-}
-
-} // namespace browser_sync

Powered by Google App Engine
This is Rietveld 408576698