android_webview/browser/aw_safe_browsing_blocking_page.cc - Issue 2852333003: Rename SafeBrowsingErrorUI to SafeBrowsingLoudErrorUI

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/browser/aw_safe_browsing_blocking_page.cc

Issue 2852333003: Rename SafeBrowsingErrorUI to SafeBrowsingLoudErrorUI (Closed)

Patch Set: Comments Created 3 years, 7 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 | « android_webview/browser/aw_safe_browsing_blocking_page.h ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0e1b40a81ffef90ec56741b6ff9ed02381beede5..b91adb791d7930ea67c9bd00c9501647096a12da 100644

--- a/android_webview/browser/aw_safe_browsing_blocking_page.cc

+++ b/android_webview/browser/aw_safe_browsing_blocking_page.cc

@@ -7,14 +7,14 @@

#include "android_webview/browser/aw_safe_browsing_ui_manager.h"

#include "components/security_interstitials/content/security_interstitial_controller_client.h"

#include "components/security_interstitials/content/unsafe_resource.h"

-#include "components/security_interstitials/core/safe_browsing_error_ui.h"

+#include "components/security_interstitials/core/base_safe_browsing_error_ui.h"

#include "content/public/browser/interstitial_page.h"

#include "content/public/browser/navigation_entry.h"

#include "content/public/browser/web_contents.h"

using content::InterstitialPage;

using content::WebContents;

-using security_interstitials::SafeBrowsingErrorUI;

+using security_interstitials::BaseSafeBrowsingErrorUI;

using security_interstitials::SecurityInterstitialControllerClient;

namespace android_webview {

@@ -25,7 +25,7 @@ AwSafeBrowsingBlockingPage::AwSafeBrowsingBlockingPage(

const GURL& main_frame_url,

const UnsafeResourceList& unsafe_resources,

std::unique_ptr<SecurityInterstitialControllerClient> controller_client,

- const SafeBrowsingErrorUI::SBErrorDisplayOptions& display_options)

+ const BaseSafeBrowsingErrorUI::SBErrorDisplayOptions& display_options)

: BaseBlockingPage(ui_manager,

web_contents,

main_frame_url,

@@ -52,8 +52,8 @@ void AwSafeBrowsingBlockingPage::ShowBlockingPage(

content::NavigationEntry* entry =

unsafe_resource.GetNavigationEntryForResource();

const UnsafeResourceList unsafe_resources{unsafe_resource};

- SafeBrowsingErrorUI::SBErrorDisplayOptions display_options =

- SafeBrowsingErrorUI::SBErrorDisplayOptions(

+ BaseSafeBrowsingErrorUI::SBErrorDisplayOptions display_options =

+ BaseSafeBrowsingErrorUI::SBErrorDisplayOptions(

IsMainPageLoadBlocked(unsafe_resources),

false, // kSafeBrowsingExtendedReportingOptInAllowed

false, // is_off_the_record