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

Unified Diff: chrome/browser/sync/profile_sync_service.cc

Issue 312333005: Make the "Tabs" item on about:sync non-yellow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added IsProxyType function and unit test Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | sync/internal_api/public/base/model_type.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index b4ce8b1c1543127e992b9f823b2d8275c40db8df..d3b5eea1b99ea7b9e3dbb29cd7d078da353232d8 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -2005,6 +2005,11 @@ base::Value* ProfileSyncService::GetTypeStatusMap() const {
", " + error.message();
type_status->SetString("status", "error");
type_status->SetString("value", error_text);
+ } else if (syncer::IsProxyType(type) && passive_types.Has(type)) {
+ // Show a proxy type in "ok" state unless it is disabled by user.
+ DCHECK(!throttled_types.Has(type));
+ type_status->SetString("status", "ok");
+ type_status->SetString("value", "Passive");
} else if (throttled_types.Has(type) && passive_types.Has(type)) {
type_status->SetString("status", "warning");
type_status->SetString("value", "Passive, Throttled");
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | sync/internal_api/public/base/model_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698