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

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

Issue 2920853004: [sync] Display an error when sync settings aren't confirmed (Closed)
Patch Set: Reformat, remove browser_options change Created 3 years, 6 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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 std::string GetSyncErrorAction(sync_ui_util::ActionType action_type) { 155 std::string GetSyncErrorAction(sync_ui_util::ActionType action_type) {
156 switch (action_type) { 156 switch (action_type) {
157 case sync_ui_util::REAUTHENTICATE: 157 case sync_ui_util::REAUTHENTICATE:
158 return "reauthenticate"; 158 return "reauthenticate";
159 case sync_ui_util::SIGNOUT_AND_SIGNIN: 159 case sync_ui_util::SIGNOUT_AND_SIGNIN:
160 return "signOutAndSignIn"; 160 return "signOutAndSignIn";
161 case sync_ui_util::UPGRADE_CLIENT: 161 case sync_ui_util::UPGRADE_CLIENT:
162 return "upgradeClient"; 162 return "upgradeClient";
163 case sync_ui_util::ENTER_PASSPHRASE: 163 case sync_ui_util::ENTER_PASSPHRASE:
164 return "enterPassphrase"; 164 return "enterPassphrase";
165 case sync_ui_util::CONFIRM_SYNC_SETTINGS:
166 return "confirmSyncSettings";
165 default: 167 default:
166 return "noAction"; 168 return "noAction";
167 } 169 }
168 } 170 }
169 171
170 } // namespace 172 } // namespace
171 173
172 namespace settings { 174 namespace settings {
173 175
174 // static 176 // static
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 base::FilePath profile_file_path = profile_->GetPath(); 906 base::FilePath profile_file_path = profile_->GetPath();
905 ProfileMetrics::LogProfileSyncSignIn(profile_file_path); 907 ProfileMetrics::LogProfileSyncSignIn(profile_file_path);
906 908
907 // We're done configuring, so notify ProfileSyncService that it is OK to 909 // We're done configuring, so notify ProfileSyncService that it is OK to
908 // start syncing. 910 // start syncing.
909 sync_blocker_.reset(); 911 sync_blocker_.reset();
910 service->SetFirstSetupComplete(); 912 service->SetFirstSetupComplete();
911 } 913 }
912 914
913 } // namespace settings 915 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/profiles/profile_chooser_view.cc ('k') | components/browser_sync/profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698