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

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: 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') | no next file » | 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 c60ec4614c27492b8a95d7f75b3c5b7af1a47224..6ce04c38a36d97b02ffc5b45e1f61ed3e7063d84 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -77,6 +77,7 @@
#include "net/cookies/cookie_monster.h"
#include "net/url_request/url_request_context_getter.h"
#include "sync/api/sync_error.h"
+#include "sync/internal_api/public/base/model_type.h"
#include "sync/internal_api/public/configure_reason.h"
#include "sync/internal_api/public/http_bridge_network_resources.h"
#include "sync/internal_api/public/network_resources.h"
@@ -1982,7 +1983,13 @@ base::Value* ProfileSyncService::GetTypeStatusMap() const {
type_status->SetString("status", "warning");
type_status->SetString("value", "Passive, Throttled");
} else if (passive_types.Has(type)) {
- type_status->SetString("status", "warning");
+ // Set status to ok for a passive proxy type (which is always passive);
rlarocque 2014/06/05 21:21:11 nit: I would rephrase this so that the check for p
stanisc 2014/06/06 01:15:44 Done.
+ // otherwise treat that as a warning.
+ if (type >= syncer::FIRST_PROXY_TYPE && type <= syncer::LAST_PROXY_TYPE) {
rlarocque 2014/06/05 21:21:11 Is there no IsProxyType() helper function in model
stanisc 2014/06/06 01:15:44 I searched for FIRST_PROXY_TYPE and LAST_PROXY_TYP
stanisc 2014/06/06 01:15:44 Done.
+ type_status->SetString("status", "ok");
+ } else {
+ type_status->SetString("status", "warning");
+ }
type_status->SetString("value", "Passive");
} else if (throttled_types.Has(type)) {
type_status->SetString("status", "warning");
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698