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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 2457483002: [MD Settings][Sync Settings] Updates sync status messages (Closed)
Patch Set: Addressed rogerta's comment Created 4 years, 1 month 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
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 277d5d35a6445ad7a22814177d13af8c5990eef2..d3e3b312e864c9dabc57c698ce729c0e13714598 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -1546,10 +1546,12 @@ BrowserOptionsHandler::GetSyncStateDictionary() {
base::string16 status_label;
base::string16 link_label;
+ sync_ui_util::ActionType actionType = sync_ui_util::NO_ACTION;
Dan Beam 2016/11/04 17:31:59 nit: action_type
Moe 2016/11/04 21:34:09 Done.
bool status_has_error =
sync_ui_util::GetStatusLabels(profile, service, *signin,
sync_ui_util::WITH_HTML, &status_label,
- &link_label) == sync_ui_util::SYNC_ERROR;
+ &link_label, &actionType) ==
+ sync_ui_util::SYNC_ERROR;
sync_status->SetString("statusText", status_label);
sync_status->SetString("actionLinkText", link_label);
sync_status->SetBoolean("hasError", status_has_error);

Powered by Google App Engine
This is Rietveld 408576698