WebView: choose loud vs. quiet interstitial

components/safe_browsing/base_blocking_page.h

 // Copyright 2017 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.
 
 #ifndef COMPONENTS_SAFE_BROWSING_BASE_BLOCKING_PAGE_H_
 #define COMPONENTS_SAFE_BROWSING_BASE_BLOCKING_PAGE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 35 matching lines @@
   // Returns true if the passed |unsafe_resources| is blocking the load of
   // the main page.
   static bool IsMainPageLoadBlocked(const UnsafeResourceList& unsafe_resources);
 
   // InterstitialPageDelegate methods:
   void OnProceed() override;
   void OnDontProceed() override;
   void CommandReceived(const std::string& command) override;
 
  protected:
+  // Used to specify which BaseSafeBrowsingErrorUI to instantiate, and
+  // parameters they require

[Jialiu Lin, 2017/05/22 17:06:00]

period at the end.

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

Done.

+  enum class ErrorUiType { LOUD, QUIET_SMALL, QUIET_GIANT };
+
   // Don't instantiate this class directly, use ShowBlockingPage instead.
   BaseBlockingPage(
       BaseUIManager* ui_manager,
       content::WebContents* web_contents,
       const GURL& main_frame_url,
       const UnsafeResourceList& unsafe_resources,
       std::unique_ptr<
           security_interstitials::SecurityInterstitialControllerClient>
           controller_client,
-      const BaseSafeBrowsingErrorUI::SBErrorDisplayOptions& display_options);
+      const BaseSafeBrowsingErrorUI::SBErrorDisplayOptions& display_options,
+      ErrorUiType type);
 
   // SecurityInterstitialPage methods:
   bool ShouldCreateNewNavigation() const override;
   void PopulateInterstitialStrings(
       base::DictionaryValue* load_time_data) override;
 
   // Called when the interstitial is going away. Intentionally do nothing in
   // this base class.
   virtual void FinishThreatDetails(const base::TimeDelta& delay,
                                    bool did_proceed,
@@ skipping 34 matching lines @@
   virtual void HandleSubresourcesAfterProceed();
 
   void SetThreatDetailsProceedDelayForTesting(int64_t delay);
 
   static std::unique_ptr<
       security_interstitials::SecurityInterstitialControllerClient>
   CreateControllerClient(content::WebContents* web_contents,
                          const UnsafeResourceList& unsafe_resources,
                          BaseUIManager* ui_manager);
 
+  int GetHTMLTemplateId() override;
+
  private:
   // For reporting back user actions.
   BaseUIManager* ui_manager_;
 
   // The URL of the main frame that caused the warning.
   GURL main_frame_url_;
 
   // The index of a navigation entry that should be removed when DontProceed()
   // is invoked, -1 if entry should not be removed.
   const int navigation_entry_index_to_remove_;
 
   // The list of unsafe resources this page is warning about.
   UnsafeResourceList unsafe_resources_;
 
   // For displaying safe browsing interstitial.
   std::unique_ptr<BaseSafeBrowsingErrorUI> sb_error_ui_;
 
   // Indicate whether user has proceeded this blocking page.
   bool proceeded_;
 
   // After a safe browsing interstitial where the user opted-in to the
   // report but clicked "proceed anyway", we delay the call to
   // ThreatDetails::FinishCollection() by this much time (in
   // milliseconds), in order to get data from the blocked resource itself.
   int64_t threat_details_proceed_delay_ms_;
 
+  ErrorUiType error_type_;

[Jialiu Lin, 2017/05/22 17:06:00]

nit: can it be const?

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

Acknowledged. Found a way to remove the member completely, which I think is the
better approach.

+
   DISALLOW_COPY_AND_ASSIGN(BaseBlockingPage);
 };
 
 }  // namespace safe_browsing
 
 #endif  // COMPONENTS_SAFE_BROWSING_BASE_BLOCKING_PAGE_H_