WebView: choose loud vs. quiet interstitial

android_webview/browser/aw_safe_browsing_blocking_page.cc

Index: android_webview/browser/aw_safe_browsing_blocking_page.cc
diff --git a/android_webview/browser/aw_safe_browsing_blocking_page.cc b/android_webview/browser/aw_safe_browsing_blocking_page.cc
index e625d9ce041fe9064f40596b76f08473d795350d..6ab83f564c82799e76919ab23fbc9db43efbf6ef 100644
--- a/android_webview/browser/aw_safe_browsing_blocking_page.cc
+++ b/android_webview/browser/aw_safe_browsing_blocking_page.cc
@@ -25,13 +25,15 @@ AwSafeBrowsingBlockingPage::AwSafeBrowsingBlockingPage(
     const GURL& main_frame_url,
     const UnsafeResourceList& unsafe_resources,
     std::unique_ptr<SecurityInterstitialControllerClient> controller_client,
-    const BaseSafeBrowsingErrorUI::SBErrorDisplayOptions& display_options)
+    const BaseSafeBrowsingErrorUI::SBErrorDisplayOptions& display_options,
+    ErrorUiType errorType)
     : BaseBlockingPage(ui_manager,
                        web_contents,
                        main_frame_url,
                        unsafe_resources,
                        std::move(controller_client),
-                       display_options) {}
+                       display_options,
+                       errorType) {}
 
 // static
 void AwSafeBrowsingBlockingPage::ShowBlockingPage(
@@ -62,11 +64,21 @@ void AwSafeBrowsingBlockingPage::ShowBlockingPage(
             false,  // kSafeBrowsingProceedAnywayDisabled
             true,   // is_resource_cancellable
             "cpn_safe_browsing_wv");  // help_center_article_link
+
+    ErrorUiType errorType;

[sgurun-gerrit only, 2017/05/22 21:05:29]

Have Java return the type rather than adding a new method for each type and
plumbing to java.

the enum is declared in Native. You can automatically generate the Java enum out
of it. See java_cpp_enum

[Nate Fischer, 2017/05/22 23:13:46]

Acknowledged. I'll work on this in the next patchset.

+    if (ui_manager->IsLoud(unsafe_resource)) {
+      errorType = ErrorUiType::LOUD;
+    } else if (ui_manager->IsGiant(unsafe_resource)) {
+      errorType = ErrorUiType::QUIET_GIANT;
+    } else {
+      errorType = ErrorUiType::QUIET_SMALL;
+    }
+
     AwSafeBrowsingBlockingPage* blocking_page = new AwSafeBrowsingBlockingPage(
         ui_manager, web_contents, entry ? entry->GetURL() : GURL(),
         unsafe_resources,
         CreateControllerClient(web_contents, unsafe_resources, ui_manager),
-        display_options);
+        display_options, errorType);
     blocking_page->Show();
   }
 }