Reflect the status of a request for accessing a blacklisted url.

chrome/browser/supervised_user/supervised_user_interstitial.cc

 // Copyright 2014 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/supervised_user/supervised_user_interstitial.h"
 
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #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"
 #include "grit/browser_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/jstemplate_builder.h"
 #include "ui/base/webui/web_ui_util.h"
 
 #if !defined(OS_ANDROID)
@@ skipping 186 matching lines @@
       ? l10n_util::GetStringUTF16(
           SupervisedUserURLFilter::GetBlockMessageID(reason_))
       : base::string16());
 
   strings.SetString("backButton", l10n_util::GetStringUTF16(IDS_BACK_BUTTON));
   strings.SetString("requestAccessButton", l10n_util::GetStringUTF16(
       is_child_account
           ? IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_ACCESS_BUTTON
           : IDS_BLOCK_INTERSTITIAL_REQUEST_ACCESS_BUTTON));
 
-  base::string16 request_sent_message;
+  base::string16 request_sent_message, request_failed_message;

[Bernhard Bauer, 2014/12/17 17:05:18]

Declare each variable on its own line.

[khannan, 2014/12/17 17:39:09]

Done.

   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);
+    request_failed_message = l10n_util::GetStringUTF16(

[Bernhard Bauer, 2014/12/17 17:05:18]

I think it starts making sense to add another case to the if-statement here
(something like this:)

  if (is_child_account) {
    if (second_custodian.empty()) {
      request_failed_message = ...;
      reqest_send_message = ...;
    } else {
      ...
    }
  } else {
    ...
  }

[khannan, 2014/12/17 17:39:09]

Done.

+        second_custodian.empty()
+            ? IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_FAILED_MESSAGE_SINGLE_PARENT
+            : 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);
 
   base::StringPiece html(ResourceBundle::GetSharedInstance().GetRawDataResource(
       IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_HTML));
 
   return webui::GetI18nTemplateHtml(html, &strings);
 }
 
 void SupervisedUserInterstitial::CommandReceived(const std::string& command) {
@@ skipping 43 matching lines @@
 void SupervisedUserInterstitial::OnDontProceed() {
   DispatchContinueRequest(false);
 }
 
 void SupervisedUserInterstitial::OnURLFilterChanged() {
   if (ShouldProceed())
     interstitial_page_->Proceed();
 }
 
 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::stringstream jsFunc;

[Bernhard Bauer, 2014/12/17 17:05:18]

Don't use string streams. Just concatenate the strings, or use 
base::StringPrintf. Also, local variables are named with underscore_style.

[khannan, 2014/12/17 17:39:09]

Done.

+  jsFunc << "requestStatus(" << success << ");";
+  interstitial_page_->GetRenderViewHostForTesting()

[Bernhard Bauer, 2014/12/17 17:05:18]

I assume you are going to ensure this method will be available for production
use before landing this CL?

[khannan, 2014/12/17 17:39:09]

Yes.

+      ->GetMainFrame()
+      ->ExecuteJavaScript(base::ASCIIToUTF16(jsFunc.str()));
+  VLOG(1) << "Executed: " + jsFunc.str();

[Bernhard Bauer, 2014/12/17 17:05:18]

I don't think this log statement is going to be useful in production.

[khannan, 2014/12/17 17:39:09]

Yup. Test code.

 }
 
 bool SupervisedUserInterstitial::ShouldProceed() {
   SupervisedUserService* supervised_user_service =
       SupervisedUserServiceFactory::GetForProfile(profile_);
   SupervisedUserURLFilter* url_filter =
       supervised_user_service->GetURLFilterForUIThread();
   SupervisedUserURLFilter::FilteringBehavior behavior;
   return (url_filter->GetManualFilteringBehaviorForURL(url_, &behavior) &&
           behavior != SupervisedUserURLFilter::BLOCK);
 }
 
 void SupervisedUserInterstitial::DispatchContinueRequest(
     bool continue_request) {
   SupervisedUserService* supervised_user_service =
       SupervisedUserServiceFactory::GetForProfile(profile_);
   supervised_user_service->RemoveObserver(this);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE, base::Bind(callback_, continue_request));
 
   // After this, the WebContents may be destroyed. Make sure we don't try to use
   // it again.
   web_contents_ = NULL;
 }