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

Unified Diff: chrome/browser/supervised_user/supervised_user_interstitial.cc

Issue 1890203002: Implement Web Restrictions in WebView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix final nits Created 4 years, 4 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/supervised_user/supervised_user_interstitial.cc
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.cc b/chrome/browser/supervised_user/supervised_user_interstitial.cc
index a0b16d3cc68092b2655a9c06f78b559475144dd7..edd9890fd9ae5eca3897be35d96730d01ab10923 100644
--- a/chrome/browser/supervised_user/supervised_user_interstitial.cc
+++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc
@@ -196,14 +196,13 @@ std::string SupervisedUserInterstitial::GetHTMLContents(
SupervisedUserService* supervised_user_service =
SupervisedUserServiceFactory::GetForProfile(profile);
- base::string16 custodian =
- base::UTF8ToUTF16(supervised_user_service->GetCustodianName());
- base::string16 second_custodian =
- base::UTF8ToUTF16(supervised_user_service->GetSecondCustodianName());
- base::string16 custodian_email =
- base::UTF8ToUTF16(supervised_user_service->GetCustodianEmailAddress());
- base::string16 second_custodian_email = base::UTF8ToUTF16(
- supervised_user_service->GetSecondCustodianEmailAddress());
+ std::string custodian = supervised_user_service->GetCustodianName();
+ std::string second_custodian =
+ supervised_user_service->GetSecondCustodianName();
+ std::string custodian_email =
+ supervised_user_service->GetCustodianEmailAddress();
+ std::string second_custodian_email =
+ supervised_user_service->GetSecondCustodianEmailAddress();
std::string profile_image_url = profile->GetPrefs()->GetString(
prefs::kSupervisedUserCustodianProfileImageURL);
std::string profile_image_url2 = profile->GetPrefs()->GetString(

Powered by Google App Engine
This is Rietveld 408576698