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

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

Issue 1194383003: Add a flag showing whether the current request was ignored by a handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix trybot failures (DidFailProvisionalLoad calls in unit tests) Created 5 years, 6 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 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
6 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_ 6 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 bool is_iframe_srcdoc) override; 72 bool is_iframe_srcdoc) override;
73 73
74 void DidCommitProvisionalLoadForFrame( 74 void DidCommitProvisionalLoadForFrame(
75 content::RenderFrameHost* render_frame_host, 75 content::RenderFrameHost* render_frame_host,
76 const GURL& url, 76 const GURL& url,
77 ui::PageTransition transition_type) override; 77 ui::PageTransition transition_type) override;
78 78
79 void DidFailProvisionalLoad(content::RenderFrameHost* render_frame_host, 79 void DidFailProvisionalLoad(content::RenderFrameHost* render_frame_host,
80 const GURL& validated_url, 80 const GURL& validated_url,
81 int error_code, 81 int error_code,
82 const base::string16& error_description) override; 82 const base::string16& error_description,
83 bool was_ignored_by_handler) override;
83 84
84 void DidStopLoading() override; 85 void DidStopLoading() override;
85 86
86 // content::NotificationObserver: 87 // content::NotificationObserver:
87 void Observe(int type, 88 void Observe(int type,
88 const content::NotificationSource& source, 89 const content::NotificationSource& source,
89 const content::NotificationDetails& details) override; 90 const content::NotificationDetails& details) override;
90 91
91 // Called when a certificate interstitial error page is about to be shown. 92 // Called when a certificate interstitial error page is about to be shown.
92 void OnSSLCertError(const net::SSLInfo& ssl_info); 93 void OnSSLCertError(const net::SSLInfo& ssl_info);
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 // cross-process navitations. NULL when there's currently no provisional 148 // cross-process navitations. NULL when there's currently no provisional
148 // load. 149 // load.
149 content::RenderViewHost* provisional_render_view_host_; 150 content::RenderViewHost* provisional_render_view_host_;
150 151
151 content::NotificationRegistrar registrar_; 152 content::NotificationRegistrar registrar_;
152 153
153 DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabHelper); 154 DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabHelper);
154 }; 155 };
155 156
156 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_ 157 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/after_startup_task_utils.cc ('k') | chrome/browser/captive_portal/captive_portal_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698