Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: chrome/browser/chromeos/login/captive_portal_view.cc

Issue 161113002: Fix pushState causing stop/reload button and favicon to flicker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
Index: chrome/browser/chromeos/login/captive_portal_view.cc
diff --git a/chrome/browser/chromeos/login/captive_portal_view.cc b/chrome/browser/chromeos/login/captive_portal_view.cc
index 7b3c70940b68eadc07860581ff1ec319c4577883..f20e759d30dfe71d2eb33f221bb577ab628f2c30 100644
--- a/chrome/browser/chromeos/login/captive_portal_view.cc
+++ b/chrome/browser/chromeos/login/captive_portal_view.cc
@@ -84,14 +84,14 @@ void CaptivePortalView::NavigationStateChanged(
// Note, |url| will be empty for "client3.google.com/generate_204" page.
if (!redirected_ && url != GURL::EmptyGURL() &&
url != GURL(CaptivePortalStartURL())) {
- DLOG(INFO) << CaptivePortalStartURL() << " vs " << url.spec();
redirected_ = true;
proxy_->OnRedirected();
}
}
-void CaptivePortalView::LoadingStateChanged(content::WebContents* source) {
- SimpleWebViewDialog::LoadingStateChanged(source);
+void CaptivePortalView::LoadingStateChanged(content::WebContents* source,
+ bool to_different_document) {
+ SimpleWebViewDialog::LoadingStateChanged(source, to_different_document);
// TODO(nkostylev): Fix case of no connectivity, check HTTP code returned.
// Disable this heuristic as it has false positives.
// Relying on just shill portal check to close dialog is fine.
« no previous file with comments | « chrome/browser/chromeos/login/captive_portal_view.h ('k') | chrome/browser/chromeos/login/simple_web_view_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698