|
@@ -256,7 +256,7 @@
|
|
|
}
|
|
|
#endif // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
|
|
|
|
|
|
-@@ -710,7 +698,9 @@ void ChromePasswordManagerClient::OnInpu
|
|
|
+@@ -713,7 +701,9 @@ void ChromePasswordManagerClient::OnInpu
|
|
|
if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
|
|
|
OnPaste();
|
|
|
} else {
|
|
@@ -266,7 +266,7 @@
|
|
|
}
|
|
|
#endif // defined(OS_ANDROID)
|
|
|
}
|
|
|
-@@ -836,9 +826,11 @@ void ChromePasswordManagerClient::OnPast
|
|
|
+@@ -839,9 +829,11 @@ void ChromePasswordManagerClient::OnPast
|
|
|
base::string16 text;
|
|
|
clipboard->ReadText(ui::ClipboardBuffer::kCopyPaste, &text);
|
|
|
was_on_paste_called_ = true;
|
|
@@ -292,7 +292,7 @@
|
|
|
safe_browsing::PasswordProtectionService* GetPasswordProtectionService()
|
|
|
--- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
|
|
|
+++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
|
|
|
-@@ -17,9 +17,7 @@
|
|
|
+@@ -18,9 +18,7 @@
|
|
|
#include "chrome/browser/permissions/permission_request.h"
|
|
|
#include "chrome/browser/permissions/quiet_notification_permission_ui_config.h"
|
|
|
#include "chrome/browser/permissions/quiet_notification_permission_ui_state.h"
|
|
@@ -302,7 +302,7 @@
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
-@@ -96,49 +94,14 @@ void ContextualNotificationPermissionUiS
|
|
|
+@@ -111,50 +109,14 @@ void ContextualNotificationPermissionUiS
|
|
|
Notify(UiToUse::kNormalUi, base::nullopt);
|
|
|
return;
|
|
|
}
|
|
@@ -331,11 +331,12 @@
|
|
|
-
|
|
|
- base::Optional<UiToUse> ui_to_use = GetUiToUseBasedOnSiteReputation(
|
|
|
- CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite(origin));
|
|
|
-- if (ui_to_use) {
|
|
|
-- OnCrowdDenyTriggerEvaluated(*ui_to_use);
|
|
|
+- if (!ui_to_use || *ui_to_use == UiToUse::kNormalUi) {
|
|
|
+- OnCrowdDenyTriggerEvaluated(UiToUse::kNormalUi);
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
+- // PreloadData suggests a spammy site, ping safe browsing to verify.
|
|
|
- DCHECK(!safe_browsing_request_);
|
|
|
- DCHECK(g_browser_process->safe_browsing_service());
|
|
|
-
|
|
@@ -456,7 +457,7 @@
|
|
|
if (url.host_piece() == chrome::kChromeUISuggestionsHost)
|
|
|
--- a/components/password_manager/content/browser/content_password_manager_driver.cc
|
|
|
+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
|
|
|
-@@ -309,7 +309,7 @@ void ContentPasswordManagerDriver::ShowT
|
|
|
+@@ -310,7 +310,7 @@ void ContentPasswordManagerDriver::ShowT
|
|
|
void ContentPasswordManagerDriver::CheckSafeBrowsingReputation(
|
|
|
const GURL& form_action,
|
|
|
const GURL& frame_url) {
|