Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc |
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc |
index 3465f8d0ebc537627c72adbbbacf192f8d0cf95e..2e404e234370cbbf44b9f85f2dd92a7802a88cec 100644 |
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc |
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc |
@@ -578,8 +578,12 @@ void AutofillDialogControllerImpl::Show() { |
content::NavigationEntry* entry = |
web_contents()->GetController().GetActiveEntry(); |
Charlie Reis
2013/11/19 21:49:15
Your previous patch deleted this line, since it's
jww
2013/11/19 22:00:00
Done.
|
- const GURL& active_url = entry ? entry->GetURL() : web_contents()->GetURL(); |
- invoked_from_same_origin_ = active_url.GetOrigin() == source_url_.GetOrigin(); |
+ // Autocomplete is show in response to a message from the renderer. As such, |
+ // it can only be made in the context of the current document and we must use |
+ // the last committed URL for access checks. |
+ const GURL& current_url = web_contents()->GetLastCommittedURL(); |
+ invoked_from_same_origin_ = |
+ current_url.GetOrigin() == source_url_.GetOrigin(); |
// Log any relevant UI metrics and security exceptions. |
GetMetricLogger().LogDialogUiEvent(AutofillMetrics::DIALOG_UI_SHOWN); |