Chromium Code Reviews| Index: chrome/browser/ui/login/login_prompt.cc |
| diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc |
| index 53f68a7b4a8f518502bdf7c005e1aaa274b15769..ca60fdaa7d663c5b2f344a3d1358e573a42a169c 100644 |
| --- a/chrome/browser/ui/login/login_prompt.cc |
| +++ b/chrome/browser/ui/login/login_prompt.cc |
| @@ -510,7 +510,10 @@ void LoginDialogCallback(const GURL& request_url, |
| } |
| if (is_main_frame && |
| - parent_contents->GetVisibleURL().GetOrigin() != request_url.GetOrigin()) { |
| + (parent_contents->GetVisibleURL().GetOrigin() != |
| + request_url.GetOrigin() || |
| + parent_contents->GetLastCommittedURL().GetOrigin() != |
| + request_url.GetOrigin())) { |
|
Peter Kasting
2014/08/05 20:18:10
It seems a bit weird that we check both of these.
meacer
2014/08/05 22:29:19
The two different cases are:
1- The user navigate
Peter Kasting
2014/08/05 23:15:34
I would probably change to just checking against G
meacer
2014/08/05 23:32:23
Done.
|
| // Show a blank interstitial for main-frame, cross origin requests |
| // so that the correct URL is shown in the omnibox. |
| base::Closure callback = base::Bind(&ShowLoginPrompt, |