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

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

Issue 1008913002: Remove RenderViewHost parameter from WebContentsObserver::Did{Start|Stop}Loading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android + Review comments Created 5 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 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 // Aborts generally aren't followed by loading an error page, so go ahead and 139 // Aborts generally aren't followed by loading an error page, so go ahead and
140 // reset the state now, to prevent any captive portal checks from triggering. 140 // reset the state now, to prevent any captive portal checks from triggering.
141 if (error_code == net::ERR_ABORTED) { 141 if (error_code == net::ERR_ABORTED) {
142 OnLoadAborted(); 142 OnLoadAborted();
143 return; 143 return;
144 } 144 }
145 145
146 pending_error_code_ = error_code; 146 pending_error_code_ = error_code;
147 } 147 }
148 148
149 void CaptivePortalTabHelper::DidStopLoading( 149 void CaptivePortalTabHelper::DidStopLoading() {
150 content::RenderViewHost* render_view_host) {
151 DCHECK(CalledOnValidThread()); 150 DCHECK(CalledOnValidThread());
152 151
153 login_detector_->OnStoppedLoading(); 152 login_detector_->OnStoppedLoading();
154 } 153 }
155 154
156 void CaptivePortalTabHelper::Observe( 155 void CaptivePortalTabHelper::Observe(
157 int type, 156 int type,
158 const content::NotificationSource& source, 157 const content::NotificationSource& source,
159 const content::NotificationDetails& details) { 158 const content::NotificationDetails& details) {
160 DCHECK(CalledOnValidThread()); 159 DCHECK(CalledOnValidThread());
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 } 264 }
266 265
267 void CaptivePortalTabHelper::SetTabReloaderForTest( 266 void CaptivePortalTabHelper::SetTabReloaderForTest(
268 CaptivePortalTabReloader* tab_reloader) { 267 CaptivePortalTabReloader* tab_reloader) {
269 tab_reloader_.reset(tab_reloader); 268 tab_reloader_.reset(tab_reloader);
270 } 269 }
271 270
272 CaptivePortalTabReloader* CaptivePortalTabHelper::GetTabReloaderForTest() { 271 CaptivePortalTabReloader* CaptivePortalTabHelper::GetTabReloaderForTest() {
273 return tab_reloader_.get(); 272 return tab_reloader_.get();
274 } 273 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698