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

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

Issue 789703004: Reflect the status of a request for accessing a blacklisted url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ui/browser_focus_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1d43850e870bd5d154640a04a1cb53147b22395d..f753e9d3297227ee8af0735c8f2a160625abfe61 100644
--- a/chrome/browser/supervised_user/supervised_user_interstitial.cc
+++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc
@@ -8,6 +8,7 @@
#include "base/metrics/histogram.h"
#include "base/prefs/pref_service.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/infobars/infobar_service.h"
@@ -23,6 +24,8 @@
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_user_data.h"
#include "content/public/browser/web_ui.h"
@@ -242,16 +245,27 @@ std::string SupervisedUserInterstitial::GetHTMLContents() {
: IDS_BLOCK_INTERSTITIAL_REQUEST_ACCESS_BUTTON));
base::string16 request_sent_message;
+ base::string16 request_failed_message;
if (is_child_account) {
- request_sent_message = l10n_util::GetStringUTF16(
- second_custodian.empty()
- ? IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_SENT_MESSAGE_SINGLE_PARENT
- : IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_SENT_MESSAGE_MULTI_PARENT);
+ if (second_custodian.empty()) {
+ request_sent_message = l10n_util::GetStringUTF16(
+ IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_SENT_MESSAGE_SINGLE_PARENT);
+ request_failed_message = l10n_util::GetStringUTF16(
+ IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_FAILED_MESSAGE_SINGLE_PARENT);
+ } else {
+ request_sent_message = l10n_util::GetStringUTF16(
+ IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_SENT_MESSAGE_MULTI_PARENT);
+ request_failed_message = l10n_util::GetStringUTF16(
+ IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_FAILED_MESSAGE_MULTI_PARENT);
+ }
} else {
request_sent_message = l10n_util::GetStringFUTF16(
IDS_BLOCK_INTERSTITIAL_REQUEST_SENT_MESSAGE, custodian);
+ request_failed_message = l10n_util::GetStringFUTF16(
+ IDS_BLOCK_INTERSTITIAL_REQUEST_FAILED_MESSAGE, custodian);
}
strings.SetString("requestSentMessage", request_sent_message);
+ strings.SetString("requestFailedMessage", request_failed_message);
webui::SetFontAndTextDirection(&strings);
@@ -333,11 +347,12 @@ void SupervisedUserInterstitial::OnURLFilterChanged() {
}
void SupervisedUserInterstitial::OnAccessRequestAdded(bool success) {
- // TODO(akuegel): Figure out how to show the result of issuing the permission
- // request in the UI. Currently, we assume the permission request was created
- // successfully.
VLOG(1) << "Sent access request for " << url_.spec()
<< (success ? " successfully" : " unsuccessfully");
+ std::string jsFunc =
+ base::StringPrintf("setRequestStatus(%s);", success ? "true" : "false");
+ interstitial_page_->GetMainFrame()->ExecuteJavaScript(
+ base::ASCIIToUTF16(jsFunc));
}
bool SupervisedUserInterstitial::ShouldProceed() {
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ui/browser_focus_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698