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

Side by Side Diff: chrome/browser/ui/webui/settings/people_handler.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 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 19 matching lines...) Expand all
30 #include "chrome/browser/ui/browser_window.h" 30 #include "chrome/browser/ui/browser_window.h"
31 #include "chrome/browser/ui/singleton_tabs.h" 31 #include "chrome/browser/ui/singleton_tabs.h"
32 #include "chrome/browser/ui/user_manager.h" 32 #include "chrome/browser/ui/user_manager.h"
33 #include "chrome/browser/ui/webui/profile_helper.h" 33 #include "chrome/browser/ui/webui/profile_helper.h"
34 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 34 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
35 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 35 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
36 #include "chrome/common/chrome_switches.h" 36 #include "chrome/common/chrome_switches.h"
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/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/strings/grit/components_strings.h"
48 #include "components/sync/base/passphrase_type.h" 48 #include "components/sync/base/passphrase_type.h"
49 #include "components/sync/driver/sync_prefs.h" 49 #include "components/sync/driver/sync_prefs.h"
50 #include "content/public/browser/render_view_host.h" 50 #include "content/public/browser/render_view_host.h"
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 base::FilePath profile_file_path = profile_->GetPath(); 897 base::FilePath profile_file_path = profile_->GetPath();
898 ProfileMetrics::LogProfileSyncSignIn(profile_file_path); 898 ProfileMetrics::LogProfileSyncSignIn(profile_file_path);
899 899
900 // We're done configuring, so notify ProfileSyncService that it is OK to 900 // We're done configuring, so notify ProfileSyncService that it is OK to
901 // start syncing. 901 // start syncing.
902 sync_blocker_.reset(); 902 sync_blocker_.reset();
903 service->SetFirstSetupComplete(); 903 service->SetFirstSetupComplete();
904 } 904 }
905 905
906 } // namespace settings 906 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698