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

Side by Side Diff: chrome/browser/supervised_user/legacy/supervised_user_registration_utility.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/supervised_user/legacy/supervised_user_registration_uti lity.h" 5 #include "chrome/browser/supervised_user/legacy/supervised_user_registration_uti lity.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/prefs/pref_service.h"
15 #include "base/rand_util.h" 14 #include "base/rand_util.h"
16 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
17 #include "build/build_config.h" 16 #include "build/build_config.h"
18 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/signin/chrome_signin_client_factory.h" 18 #include "chrome/browser/signin/chrome_signin_client_factory.h"
20 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 19 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
21 #include "chrome/browser/signin/signin_manager_factory.h" 20 #include "chrome/browser/signin/signin_manager_factory.h"
22 #include "chrome/browser/supervised_user/legacy/supervised_user_refresh_token_fe tcher.h" 21 #include "chrome/browser/supervised_user/legacy/supervised_user_refresh_token_fe tcher.h"
23 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h" 22 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h"
24 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service_factory.h" 23 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service_factory.h"
25 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ update.h" 24 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ update.h"
26 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" 25 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
27 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_fac tory.h" 26 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_fac tory.h"
28 #include "chrome/browser/supervised_user/supervised_user_constants.h" 27 #include "chrome/browser/supervised_user/supervised_user_constants.h"
29 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
30 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
30 #include "components/prefs/pref_service.h"
31 #include "components/signin/core/browser/profile_oauth2_token_service.h" 31 #include "components/signin/core/browser/profile_oauth2_token_service.h"
32 #include "components/signin/core/browser/signin_client.h" 32 #include "components/signin/core/browser/signin_client.h"
33 #include "components/signin/core/browser/signin_manager.h" 33 #include "components/signin/core/browser/signin_manager.h"
34 #include "content/public/browser/browser_thread.h" 34 #include "content/public/browser/browser_thread.h"
35 #include "google_apis/gaia/gaia_urls.h" 35 #include "google_apis/gaia/gaia_urls.h"
36 #include "google_apis/gaia/google_service_auth_error.h" 36 #include "google_apis/gaia/google_service_auth_error.h"
37 #include "sync/util/get_session_name.h" 37 #include "sync/util/get_session_name.h"
38 38
39 using base::DictionaryValue; 39 using base::DictionaryValue;
40 40
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 pending_supervised_user_id_); 410 pending_supervised_user_id_);
411 } 411 }
412 } 412 }
413 413
414 if (run_callback) 414 if (run_callback)
415 callback_.Run(error, pending_supervised_user_token_); 415 callback_.Run(error, pending_supervised_user_token_);
416 callback_.Reset(); 416 callback_.Reset();
417 } 417 }
418 418
419 } // namespace 419 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698