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

Side by Side Diff: chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. 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) 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 <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.h" 11 #include "chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/sync/profile_sync_service_factory.h" 13 #include "chrome/browser/sync/profile_sync_service_factory.h"
14 #include "chrome/common/extensions/api/signed_in_devices.h" 14 #include "chrome/common/extensions/api/signed_in_devices.h"
15 #include "components/browser_sync/browser/profile_sync_service.h" 15 #include "components/browser_sync/profile_sync_service.h"
16 #include "components/sync/device_info/device_info_tracker.h" 16 #include "components/sync/device_info/device_info_tracker.h"
17 #include "components/sync/device_info/local_device_info_provider.h" 17 #include "components/sync/device_info/local_device_info_provider.h"
18 #include "extensions/browser/extension_prefs.h" 18 #include "extensions/browser/extension_prefs.h"
19 19
20 using base::DictionaryValue; 20 using base::DictionaryValue;
21 using sync_driver::DeviceInfo; 21 using sync_driver::DeviceInfo;
22 using sync_driver::DeviceInfoTracker; 22 using sync_driver::DeviceInfoTracker;
23 using sync_driver::LocalDeviceInfoProvider; 23 using sync_driver::LocalDeviceInfoProvider;
24 24
25 namespace extensions { 25 namespace extensions {
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 for (const std::unique_ptr<DeviceInfo>& device : devices) 138 for (const std::unique_ptr<DeviceInfo>& device : devices)
139 result->Append(device->ToValue()); 139 result->Append(device->ToValue());
140 140
141 SetResult(std::move(result)); 141 SetResult(std::move(result));
142 return true; 142 return true;
143 } 143 }
144 144
145 } // namespace extensions 145 } // namespace extensions
146 146
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698