diff options
| author | stanisc <stanisc@chromium.org> | 2014-09-25 23:17:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-26 06:17:51 +0000 |
| commit | d0df01813574affc20bb17dfac783ad325d4bb06 (patch) | |
| tree | 6f104952581c8098b4d7d4d156e43e18c9b447f3 /chrome/browser/supervised_user/supervised_user_registration_utility.cc | |
| parent | 3cc3a684c62e2344aaa5a6a84f9300926330e4d3 (diff) | |
| download | chromium_src-d0df01813574affc20bb17dfac783ad325d4bb06.zip chromium_src-d0df01813574affc20bb17dfac783ad325d4bb06.tar.gz chromium_src-d0df01813574affc20bb17dfac783ad325d4bb06.tar.bz2 | |
Device info datatype should be moved to components/sync_driver.
Moving device_info* and local_device_info_provider.h to components/sync_driver
and updating namespaces for the related classes from browsing_sync to sync_driver.
Most of the changes are mechanical - trivial changes of header files and namespaces.
There are just few less trivial changes:
1) I've removed GetClientName from DeviceInfo because it depended on content/public.
Instead I've inlined GetClientName code (which is rather trivial) in two places where
it was used, including supervised_user_registration_utility.cc.
That required me to update DEPS file for supervised_user. There isn't anything new
in reality - these dependencies already existed indirectly.
2) Added two extra parameters to DeviceInfoDataTypeController to avoid having
direct dependencies on the browser.
TBR=pkasting@chromium.org,yoz@chromium.org
BUG=396136
Review URL: https://codereview.chromium.org/597423002
Cr-Commit-Position: refs/heads/master@{#296895}
Diffstat (limited to 'chrome/browser/supervised_user/supervised_user_registration_utility.cc')
| -rw-r--r-- | chrome/browser/supervised_user/supervised_user_registration_utility.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/supervised_user/supervised_user_registration_utility.cc b/chrome/browser/supervised_user/supervised_user_registration_utility.cc index c1eb8b0..0f58243 100644 --- a/chrome/browser/supervised_user/supervised_user_registration_utility.cc +++ b/chrome/browser/supervised_user/supervised_user_registration_utility.cc @@ -22,14 +22,15 @@ #include "chrome/browser/supervised_user/supervised_user_shared_settings_update.h" #include "chrome/browser/supervised_user/supervised_user_sync_service.h" #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h" -#include "chrome/browser/sync/glue/device_info.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_client.h" #include "components/signin/core/browser/signin_manager.h" +#include "content/public/browser/browser_thread.h" #include "google_apis/gaia/gaia_urls.h" #include "google_apis/gaia/google_service_auth_error.h" +#include "sync/util/get_session_name.h" using base::DictionaryValue; @@ -304,7 +305,8 @@ void SupervisedUserRegistrationUtilityImpl::Register( weak_ptr_factory_.GetWeakPtr()))); } - browser_sync::DeviceInfo::GetClientName( + syncer::GetSessionName( + content::BrowserThread::GetBlockingPool(), base::Bind(&SupervisedUserRegistrationUtilityImpl::FetchToken, weak_ptr_factory_.GetWeakPtr())); } |