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

Side by Side Diff: components/browser_sync/browser/profile_sync_service.cc

Issue 2004523002: Revert of [sync] Sign user out of Chrome on dashboard stop and reset (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "components/browser_sync/browser/profile_sync_service.h" 5 #include "components/browser_sync/browser/profile_sync_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <cstddef> 8 #include <cstddef>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 1265 matching lines...) Expand 10 before | Expand all | Expand 10 after
1276 last_actionable_error_.error_description, 1276 last_actionable_error_.error_description,
1277 true, 1277 true,
1278 ERROR_REASON_ACTIONABLE_ERROR); 1278 ERROR_REASON_ACTIONABLE_ERROR);
1279 break; 1279 break;
1280 case syncer::DISABLE_SYNC_ON_CLIENT: 1280 case syncer::DISABLE_SYNC_ON_CLIENT:
1281 if (error.error_type == syncer::NOT_MY_BIRTHDAY) { 1281 if (error.error_type == syncer::NOT_MY_BIRTHDAY) {
1282 UMA_HISTOGRAM_ENUMERATION("Sync.StopSource", syncer::BIRTHDAY_ERROR, 1282 UMA_HISTOGRAM_ENUMERATION("Sync.StopSource", syncer::BIRTHDAY_ERROR,
1283 syncer::STOP_SOURCE_LIMIT); 1283 syncer::STOP_SOURCE_LIMIT);
1284 } 1284 }
1285 RequestStop(CLEAR_DATA); 1285 RequestStop(CLEAR_DATA);
1286 #if !defined(OS_CHROMEOS) 1286 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
1287 // On every platform except ChromeOS, sign out the user after a dashboard 1287 // On desktop and iOS, sign out the user after a dashboard clear.
1288 // clear.
1289 static_cast<SigninManager*>(signin_->GetOriginal()) 1288 static_cast<SigninManager*>(signin_->GetOriginal())
1290 ->SignOut(signin_metrics::SERVER_FORCED_DISABLE, 1289 ->SignOut(signin_metrics::SERVER_FORCED_DISABLE,
1291 signin_metrics::SignoutDelete::IGNORE_METRIC); 1290 signin_metrics::SignoutDelete::IGNORE_METRIC);
1292 #endif 1291 #endif
1293 break; 1292 break;
1294 case syncer::STOP_SYNC_FOR_DISABLED_ACCOUNT: 1293 case syncer::STOP_SYNC_FOR_DISABLED_ACCOUNT:
1295 // Sync disabled by domain admin. we should stop syncing until next 1294 // Sync disabled by domain admin. we should stop syncing until next
1296 // restart. 1295 // restart.
1297 sync_disabled_by_admin_ = true; 1296 sync_disabled_by_admin_ = true;
1298 ShutdownImpl(syncer::DISABLE_SYNC); 1297 ShutdownImpl(syncer::DISABLE_SYNC);
(...skipping 1234 matching lines...) Expand 10 before | Expand all | Expand 10 after
2533 } 2532 }
2534 2533
2535 std::string ProfileSyncService::unrecoverable_error_message() const { 2534 std::string ProfileSyncService::unrecoverable_error_message() const {
2536 return unrecoverable_error_message_; 2535 return unrecoverable_error_message_;
2537 } 2536 }
2538 2537
2539 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() 2538 tracked_objects::Location ProfileSyncService::unrecoverable_error_location()
2540 const { 2539 const {
2541 return unrecoverable_error_location_; 2540 return unrecoverable_error_location_;
2542 } 2541 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698