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

Side by Side Diff: chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_api. h" 5 #include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api. h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.h" 10 #include "chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/sync/glue/device_info_tracker.h"
13 #include "chrome/browser/sync/glue/local_device_info_provider.h"
14 #include "chrome/browser/sync/profile_sync_service.h" 12 #include "chrome/browser/sync/profile_sync_service.h"
15 #include "chrome/browser/sync/profile_sync_service_factory.h" 13 #include "chrome/browser/sync/profile_sync_service_factory.h"
16 #include "chrome/common/extensions/api/signed_in_devices.h" 14 #include "chrome/common/extensions/api/signed_in_devices.h"
15 #include "components/sync_driver/device_info_tracker.h"
16 #include "components/sync_driver/local_device_info_provider.h"
17 #include "extensions/browser/extension_prefs.h" 17 #include "extensions/browser/extension_prefs.h"
18 18
19 using base::DictionaryValue; 19 using base::DictionaryValue;
20 using browser_sync::DeviceInfo; 20 using sync_driver::DeviceInfo;
21 using browser_sync::DeviceInfoTracker; 21 using sync_driver::DeviceInfoTracker;
22 using browser_sync::LocalDeviceInfoProvider; 22 using sync_driver::LocalDeviceInfoProvider;
23 23
24 namespace extensions { 24 namespace extensions {
25 25
26 static const char kPrefStringForIdMapping[] = "id_mapping_dictioanry"; 26 static const char kPrefStringForIdMapping[] = "id_mapping_dictioanry";
27 27
28 // Gets the dictionary that stores the id mapping. The dictionary is stored 28 // Gets the dictionary that stores the id mapping. The dictionary is stored
29 // in the |ExtensionPrefs|. 29 // in the |ExtensionPrefs|.
30 const base::DictionaryValue* GetIdMappingDictionary( 30 const base::DictionaryValue* GetIdMappingDictionary(
31 ExtensionPrefs* extension_prefs, 31 ExtensionPrefs* extension_prefs,
32 const std::string& extension_id) { 32 const std::string& extension_id) {
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 ++it) { 138 ++it) {
139 result->Append((*it)->ToValue()); 139 result->Append((*it)->ToValue());
140 } 140 }
141 141
142 SetResult(result.release()); 142 SetResult(result.release());
143 return true; 143 return true;
144 } 144 }
145 145
146 } // namespace extensions 146 } // namespace extensions
147 147
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698