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

Side by Side Diff: chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.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, 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/api/signed_in_devices/signed_in_devices_mana ger.h" 5 #include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_mana ger.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/memory/linked_ptr.h" 11 #include "base/memory/linked_ptr.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/scoped_vector.h" 13 #include "base/memory/scoped_vector.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api. h" 15 #include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api. h"
16 #include "chrome/browser/extensions/extension_service.h" 16 #include "chrome/browser/extensions/extension_service.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/sync/glue/device_info.h"
19 #include "chrome/browser/sync/profile_sync_service.h" 18 #include "chrome/browser/sync/profile_sync_service.h"
20 #include "chrome/browser/sync/profile_sync_service_factory.h" 19 #include "chrome/browser/sync/profile_sync_service_factory.h"
21 #include "chrome/common/extensions/api/signed_in_devices.h" 20 #include "chrome/common/extensions/api/signed_in_devices.h"
21 #include "components/sync_driver/device_info.h"
22 #include "extensions/browser/event_router.h" 22 #include "extensions/browser/event_router.h"
23 #include "extensions/browser/extension_registry.h" 23 #include "extensions/browser/extension_registry.h"
24 #include "extensions/common/extension.h" 24 #include "extensions/common/extension.h"
25 25
26 using browser_sync::DeviceInfo; 26 using sync_driver::DeviceInfo;
27 namespace extensions { 27 namespace extensions {
28 28
29 namespace { 29 namespace {
30 void FillDeviceInfo(const DeviceInfo& device_info, 30 void FillDeviceInfo(const DeviceInfo& device_info,
31 api::signed_in_devices::DeviceInfo* api_device_info) { 31 api::signed_in_devices::DeviceInfo* api_device_info) {
32 api_device_info->id = device_info.public_id(); 32 api_device_info->id = device_info.public_id();
33 api_device_info->name = device_info.client_name(); 33 api_device_info->name = device_info.client_name();
34 api_device_info->os = api::signed_in_devices::ParseOS( 34 api_device_info->os = api::signed_in_devices::ParseOS(
35 device_info.GetOSString()); 35 device_info.GetOSString());
36 api_device_info->type = api::signed_in_devices::ParseDeviceType( 36 api_device_info->type = api::signed_in_devices::ParseDeviceType(
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 } 151 }
152 152
153 void SignedInDevicesManager::OnExtensionUnloaded( 153 void SignedInDevicesManager::OnExtensionUnloaded(
154 content::BrowserContext* browser_context, 154 content::BrowserContext* browser_context,
155 const Extension* extension, 155 const Extension* extension,
156 UnloadedExtensionInfo::Reason reason) { 156 UnloadedExtensionInfo::Reason reason) {
157 RemoveChangeObserverForExtension(extension->id()); 157 RemoveChangeObserverForExtension(extension->id());
158 } 158 }
159 159
160 } // namespace extensions 160 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698