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

Side by Side Diff: chrome/browser/ui/webui/settings/people_handler.cc

Issue 1984313003: Settings People Revamp: Update main card Sync 'look' to match new spec. (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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/ui/webui/settings/people_handler.h" 5 #include "chrome/browser/ui/webui/settings/people_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 sync_status->SetBoolean("setupCompleted", 730 sync_status->SetBoolean("setupCompleted",
731 service && service->IsFirstSetupComplete()); 731 service && service->IsFirstSetupComplete());
732 sync_status->SetBoolean( 732 sync_status->SetBoolean(
733 "setupInProgress", 733 "setupInProgress",
734 service && !service->IsManaged() && service->IsFirstSetupInProgress()); 734 service && !service->IsManaged() && service->IsFirstSetupInProgress());
735 735
736 base::string16 status_label; 736 base::string16 status_label;
737 base::string16 link_label; 737 base::string16 link_label;
738 bool status_has_error = 738 bool status_has_error =
739 sync_ui_util::GetStatusLabels(profile_, service, *signin, 739 sync_ui_util::GetStatusLabels(profile_, service, *signin,
740 sync_ui_util::WITH_HTML, &status_label, 740 sync_ui_util::PLAIN_TEXT, &status_label,
741 &link_label) == sync_ui_util::SYNC_ERROR; 741 &link_label) == sync_ui_util::SYNC_ERROR;
742 sync_status->SetString("statusText", status_label); 742 sync_status->SetString("statusText", status_label);
743 sync_status->SetString("actionLinkText", link_label); 743 sync_status->SetString("actionLinkText", link_label);
744 sync_status->SetBoolean("hasError", status_has_error); 744 sync_status->SetBoolean("hasError", status_has_error);
745 745
746 sync_status->SetBoolean("managed", service && service->IsManaged()); 746 sync_status->SetBoolean("managed", service && service->IsManaged());
747 sync_status->SetBoolean("signedIn", signin->IsAuthenticated()); 747 sync_status->SetBoolean("signedIn", signin->IsAuthenticated());
748 sync_status->SetBoolean("hasUnrecoverableError", 748 sync_status->SetBoolean("hasUnrecoverableError",
749 service && service->HasUnrecoverableError()); 749 service && service->HasUnrecoverableError());
750 750
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 base::FilePath profile_file_path = profile_->GetPath(); 912 base::FilePath profile_file_path = profile_->GetPath();
913 ProfileMetrics::LogProfileSyncSignIn(profile_file_path); 913 ProfileMetrics::LogProfileSyncSignIn(profile_file_path);
914 914
915 // We're done configuring, so notify ProfileSyncService that it is OK to 915 // We're done configuring, so notify ProfileSyncService that it is OK to
916 // start syncing. 916 // start syncing.
917 service->SetSetupInProgress(false); 917 service->SetSetupInProgress(false);
918 service->SetFirstSetupComplete(); 918 service->SetFirstSetupComplete();
919 } 919 }
920 920
921 } // namespace settings 921 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698