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

Side by Side Diff: chrome/browser/ui/webui/settings/people_handler.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "net/base/url_util.h" 55 #include "net/base/url_util.h"
56 #include "ui/base/l10n/l10n_util.h" 56 #include "ui/base/l10n/l10n_util.h"
57 #include "ui/base/webui/web_ui_util.h" 57 #include "ui/base/webui/web_ui_util.h"
58 58
59 #if defined(OS_CHROMEOS) 59 #if defined(OS_CHROMEOS)
60 #include "components/signin/core/browser/signin_manager_base.h" 60 #include "components/signin/core/browser/signin_manager_base.h"
61 #else 61 #else
62 #include "components/signin/core/browser/signin_manager.h" 62 #include "components/signin/core/browser/signin_manager.h"
63 #endif 63 #endif
64 64
65 using browser_sync::ProfileSyncService;
65 using content::WebContents; 66 using content::WebContents;
66 using l10n_util::GetStringFUTF16; 67 using l10n_util::GetStringFUTF16;
67 using l10n_util::GetStringUTF16; 68 using l10n_util::GetStringUTF16;
68 69
69 namespace { 70 namespace {
70 71
71 // A structure which contains all the configuration information for sync. 72 // A structure which contains all the configuration information for sync.
72 struct SyncConfigInfo { 73 struct SyncConfigInfo {
73 SyncConfigInfo(); 74 SyncConfigInfo();
74 ~SyncConfigInfo(); 75 ~SyncConfigInfo();
(...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 base::FilePath profile_file_path = profile_->GetPath(); 898 base::FilePath profile_file_path = profile_->GetPath();
898 ProfileMetrics::LogProfileSyncSignIn(profile_file_path); 899 ProfileMetrics::LogProfileSyncSignIn(profile_file_path);
899 900
900 // We're done configuring, so notify ProfileSyncService that it is OK to 901 // We're done configuring, so notify ProfileSyncService that it is OK to
901 // start syncing. 902 // start syncing.
902 sync_blocker_.reset(); 903 sync_blocker_.reset();
903 service->SetFirstSetupComplete(); 904 service->SetFirstSetupComplete();
904 } 905 }
905 906
906 } // namespace settings 907 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/settings/people_handler.h ('k') | chrome/browser/ui/webui/settings/people_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698