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

Side by Side Diff: chrome/browser/captive_portal/captive_portal_tab_helper.cc

Issue 580133002: Update entry page type to include error pages when appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile fix for unit_tests Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" 5 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "chrome/browser/captive_portal/captive_portal_login_detector.h" 8 #include "chrome/browser/captive_portal/captive_portal_login_detector.h"
9 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" 9 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
10 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h" 10 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 provisional_render_view_host_ = render_view_host; 94 provisional_render_view_host_ = render_view_host;
95 pending_error_code_ = net::OK; 95 pending_error_code_ = net::OK;
96 96
97 tab_reloader_->OnLoadStart(validated_url.SchemeIsSecure()); 97 tab_reloader_->OnLoadStart(validated_url.SchemeIsSecure());
98 } 98 }
99 99
100 void CaptivePortalTabHelper::DidCommitProvisionalLoadForFrame( 100 void CaptivePortalTabHelper::DidCommitProvisionalLoadForFrame(
101 content::RenderFrameHost* render_frame_host, 101 content::RenderFrameHost* render_frame_host,
102 const GURL& url, 102 const GURL& url,
103 bool url_is_unreachable,
103 ui::PageTransition transition_type) { 104 ui::PageTransition transition_type) {
104 DCHECK(CalledOnValidThread()); 105 DCHECK(CalledOnValidThread());
105 106
106 // Ignore subframes. 107 // Ignore subframes.
107 if (render_frame_host->GetParent()) 108 if (render_frame_host->GetParent())
108 return; 109 return;
109 110
110 if (provisional_render_view_host_ == render_frame_host->GetRenderViewHost()) { 111 if (provisional_render_view_host_ == render_frame_host->GetRenderViewHost()) {
111 tab_reloader_->OnLoadCommitted(pending_error_code_); 112 tab_reloader_->OnLoadCommitted(pending_error_code_);
112 } else { 113 } else {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 // Otherwise, open a login tab. Only end up here when a captive portal result 259 // Otherwise, open a login tab. Only end up here when a captive portal result
259 // was received, so it's safe to assume |profile_| has a CaptivePortalService. 260 // was received, so it's safe to assume |profile_| has a CaptivePortalService.
260 content::WebContents* web_contents = chrome::AddSelectedTabWithURL( 261 content::WebContents* web_contents = chrome::AddSelectedTabWithURL(
261 browser, 262 browser,
262 CaptivePortalServiceFactory::GetForProfile(profile_)->test_url(), 263 CaptivePortalServiceFactory::GetForProfile(profile_)->test_url(),
263 ui::PAGE_TRANSITION_TYPED); 264 ui::PAGE_TRANSITION_TYPED);
264 CaptivePortalTabHelper* captive_portal_tab_helper = 265 CaptivePortalTabHelper* captive_portal_tab_helper =
265 CaptivePortalTabHelper::FromWebContents(web_contents); 266 CaptivePortalTabHelper::FromWebContents(web_contents);
266 captive_portal_tab_helper->SetIsLoginTab(); 267 captive_portal_tab_helper->SetIsLoginTab();
267 } 268 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698