|
@@ -1123,7 +1123,7 @@
|
|
|
|
|
|
#if defined(OS_ANDROID)
|
|
|
#include "chrome/browser/android/tab_android.h"
|
|
|
-@@ -826,6 +825,7 @@ autofill::LanguageCode ChromePasswordMan
|
|
|
+@@ -828,6 +827,7 @@ autofill::LanguageCode ChromePasswordMan
|
|
|
return autofill::LanguageCode();
|
|
|
}
|
|
|
|
|
@@ -1131,7 +1131,7 @@
|
|
|
safe_browsing::PasswordProtectionService*
|
|
|
ChromePasswordManagerClient::GetPasswordProtectionService() const {
|
|
|
return safe_browsing::ChromePasswordProtectionService::
|
|
|
-@@ -836,13 +836,6 @@ ChromePasswordManagerClient::GetPassword
|
|
|
+@@ -838,13 +838,6 @@ ChromePasswordManagerClient::GetPassword
|
|
|
void ChromePasswordManagerClient::CheckSafeBrowsingReputation(
|
|
|
const GURL& form_action,
|
|
|
const GURL& frame_url) {
|
|
@@ -1145,7 +1145,7 @@
|
|
|
}
|
|
|
#endif // defined(ON_FOCUS_PING_ENABLED)
|
|
|
|
|
|
-@@ -852,22 +845,10 @@ void ChromePasswordManagerClient::CheckP
|
|
|
+@@ -854,22 +847,10 @@ void ChromePasswordManagerClient::CheckP
|
|
|
const std::vector<password_manager::MatchingReusedCredential>&
|
|
|
matching_reused_credentials,
|
|
|
bool password_field_exists) {
|
|
@@ -1169,7 +1169,7 @@
|
|
|
}
|
|
|
|
|
|
#if !defined(OS_ANDROID)
|
|
|
-@@ -1366,9 +1347,11 @@ void ChromePasswordManagerClient::OnPast
|
|
|
+@@ -1383,9 +1364,11 @@ void ChromePasswordManagerClient::OnPast
|
|
|
}
|
|
|
|
|
|
was_on_paste_called_ = true;
|
|
@@ -1182,7 +1182,7 @@
|
|
|
|
|
|
void ChromePasswordManagerClient::RenderFrameCreated(
|
|
|
content::RenderFrameHost* render_frame_host) {
|
|
|
-@@ -1403,7 +1386,9 @@ void ChromePasswordManagerClient::OnInpu
|
|
|
+@@ -1420,7 +1403,9 @@ void ChromePasswordManagerClient::OnInpu
|
|
|
if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
|
|
|
OnPaste();
|
|
|
} else {
|
|
@@ -1192,7 +1192,7 @@
|
|
|
}
|
|
|
#endif // defined(OS_ANDROID)
|
|
|
}
|
|
|
-@@ -1442,6 +1427,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
+@@ -1459,6 +1444,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
is_enabled = false;
|
|
|
}
|
|
|
|
|
@@ -1200,7 +1200,7 @@
|
|
|
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
|
|
|
// warnings until user interaction. If the current page has a delayed warning,
|
|
|
// it'll have a user interaction observer attached. Disable password
|
|
|
-@@ -1452,6 +1438,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
+@@ -1469,6 +1455,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
observer->OnPasswordSaveOrAutofillDenied();
|
|
|
is_enabled = false;
|
|
|
}
|