[MD Settings][People] Visual updates to the sync setup page.

chrome/browser/ui/webui/settings/people_handler.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/settings/people_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 850 matching lines @@
                             passphrase_time_str));
         break;
       default:
         args.SetString("fullEncryptionBody",
                        GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM));
         break;
     }
   } else if (passphrase_type == syncer::PassphraseType::CUSTOM_PASSPHRASE) {
     args.SetString("fullEncryptionBody",
                    GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM));
-  } else {
-    args.SetString("fullEncryptionBody",

[tommycli, 2016/10/25 18:28:46]

Why was this removed? Is this string never used?

-                   GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_DATA));

[Moe, 2016/10/25 22:30:18]

I don't think this was ever necessary. This string is identical to
'encryptWithSyncPassphraseLabel' which is used in
https://cs.chromium.org/chromium/src/chrome/browser/resources/settings/people...
if fullEncryptionBody isn't set.
Since the string in the mocks seems to have a hyperlink, in order to avoid the
inner-h-t-m-l hack, I changed the logic by not setting the fullEncryptionBody
here and instead use encryptWithSyncPassphraseLabel directly in sync_page.html

   }
 
   CallJavascriptFunction("cr.webUIListenerCallback",
                          base::StringValue("sync-prefs-changed"), args);
 }
 
 LoginUIService* PeopleHandler::GetLoginUIService() const {
   return LoginUIServiceFactory::GetForProfile(profile_);
 }
 
@@ skipping 17 matching lines @@
   base::FilePath profile_file_path = profile_->GetPath();
   ProfileMetrics::LogProfileSyncSignIn(profile_file_path);
 
   // We're done configuring, so notify ProfileSyncService that it is OK to
   // start syncing.
   sync_blocker_.reset();
   service->SetFirstSetupComplete();
 }
 
 }  // namespace settings