diff options
author | Torne (Richard Coles) <torne@google.com> | 2013-09-12 12:10:22 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2013-09-12 12:10:22 +0100 |
commit | 58537e28ecd584eab876aee8be7156509866d23a (patch) | |
tree | 8988984e52090aaadf33cff139d7dd212cd13656 /chrome/browser/sync/profile_sync_service.h | |
parent | 0a1b11dee8e5cb2520121c300858fea6138e3c54 (diff) | |
download | chromium_org-58537e28ecd584eab876aee8be7156509866d23a.tar.gz |
Merge from Chromium at DEPS revision 222756
This commit was generated by merge_to_master.py.
Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
Diffstat (limited to 'chrome/browser/sync/profile_sync_service.h')
-rw-r--r-- | chrome/browser/sync/profile_sync_service.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h index c7a19a9150..7c84c67d88 100644 --- a/chrome/browser/sync/profile_sync_service.h +++ b/chrome/browser/sync/profile_sync_service.h @@ -284,7 +284,7 @@ class ProfileSyncService : public ProfileSyncServiceBase, // Gets the device info for all devices signed into the account associated // with this profile. - virtual ScopedVector<browser_sync::DeviceInfo> GetAllSignedinDevices() const; + virtual ScopedVector<browser_sync::DeviceInfo> GetAllSignedInDevices() const; // Notifies the observer of any device info changes. virtual void AddObserverForDeviceInfoChange( |