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

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

Issue 8383036: Adding parameter to GetStatusLabels to indicate if links are acceptable. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix following try test. Created 9 years, 2 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
Index: chrome/browser/ui/webui/options/personal_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc
index 0851e4f41f0f443f6e0bfc54f088cfc1edae158d..e31560e5e52586ed43c909a4dd7566aada35d927 100644
--- a/chrome/browser/ui/webui/options/personal_options_handler.cc
+++ b/chrome/browser/ui/webui/options/personal_options_handler.cc
@@ -247,7 +247,8 @@ void PersonalOptionsHandler::OnStateChanged() {
bool managed = service->IsManaged();
bool sync_setup_completed = service->HasSyncSetupCompleted();
bool status_has_error = sync_ui_util::GetStatusLabels(
- service, &status_label, &link_label) == sync_ui_util::SYNC_ERROR;
+ service, sync_ui_util::WITH_HTML, &status_label, &link_label) ==
+ sync_ui_util::SYNC_ERROR;
string16 start_stop_button_label;
bool is_start_stop_button_visible = false;
« chrome/browser/sync/sync_ui_util.h ('K') | « chrome/browser/sync/sync_ui_util_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698