OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/ui/webui/settings/people_handler.h" | 5 #include "chrome/browser/ui/webui/settings/people_handler.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 #include "chrome/grit/generated_resources.h" | 37 #include "chrome/grit/generated_resources.h" |
38 #include "components/autofill/core/common/autofill_constants.h" | 38 #include "components/autofill/core/common/autofill_constants.h" |
39 #include "components/autofill/core/common/autofill_pref_names.h" | 39 #include "components/autofill/core/common/autofill_pref_names.h" |
40 #include "components/browser_sync/browser/profile_sync_service.h" | 40 #include "components/browser_sync/browser/profile_sync_service.h" |
41 #include "components/prefs/pref_service.h" | 41 #include "components/prefs/pref_service.h" |
42 #include "components/signin/core/browser/signin_error_controller.h" | 42 #include "components/signin/core/browser/signin_error_controller.h" |
43 #include "components/signin/core/browser/signin_header_helper.h" | 43 #include "components/signin/core/browser/signin_header_helper.h" |
44 #include "components/signin/core/browser/signin_metrics.h" | 44 #include "components/signin/core/browser/signin_metrics.h" |
45 #include "components/signin/core/common/profile_management_switches.h" | 45 #include "components/signin/core/common/profile_management_switches.h" |
46 #include "components/signin/core/common/signin_pref_names.h" | 46 #include "components/signin/core/common/signin_pref_names.h" |
| 47 #include "components/strings/grit/components_strings.h" |
47 #include "components/sync/driver/sync_prefs.h" | 48 #include "components/sync/driver/sync_prefs.h" |
48 #include "content/public/browser/render_view_host.h" | 49 #include "content/public/browser/render_view_host.h" |
49 #include "content/public/browser/web_contents.h" | 50 #include "content/public/browser/web_contents.h" |
50 #include "content/public/browser/web_contents_delegate.h" | 51 #include "content/public/browser/web_contents_delegate.h" |
51 #include "google_apis/gaia/gaia_auth_util.h" | 52 #include "google_apis/gaia/gaia_auth_util.h" |
52 #include "google_apis/gaia/gaia_constants.h" | 53 #include "google_apis/gaia/gaia_constants.h" |
53 #include "grit/components_strings.h" | |
54 #include "net/base/url_util.h" | 54 #include "net/base/url_util.h" |
55 #include "ui/base/l10n/l10n_util.h" | 55 #include "ui/base/l10n/l10n_util.h" |
56 #include "ui/base/webui/web_ui_util.h" | 56 #include "ui/base/webui/web_ui_util.h" |
57 | 57 |
58 #if defined(OS_CHROMEOS) | 58 #if defined(OS_CHROMEOS) |
59 #include "components/signin/core/browser/signin_manager_base.h" | 59 #include "components/signin/core/browser/signin_manager_base.h" |
60 #else | 60 #else |
61 #include "components/signin/core/browser/signin_manager.h" | 61 #include "components/signin/core/browser/signin_manager.h" |
62 #endif | 62 #endif |
63 | 63 |
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
894 base::FilePath profile_file_path = profile_->GetPath(); | 894 base::FilePath profile_file_path = profile_->GetPath(); |
895 ProfileMetrics::LogProfileSyncSignIn(profile_file_path); | 895 ProfileMetrics::LogProfileSyncSignIn(profile_file_path); |
896 | 896 |
897 // We're done configuring, so notify ProfileSyncService that it is OK to | 897 // We're done configuring, so notify ProfileSyncService that it is OK to |
898 // start syncing. | 898 // start syncing. |
899 sync_blocker_.reset(); | 899 sync_blocker_.reset(); |
900 service->SetFirstSetupComplete(); | 900 service->SetFirstSetupComplete(); |
901 } | 901 } |
902 | 902 |
903 } // namespace settings | 903 } // namespace settings |
OLD | NEW |