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

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

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 class CaptivePortalTabHelper 57 class CaptivePortalTabHelper
58 : public content::WebContentsObserver, 58 : public content::WebContentsObserver,
59 public content::NotificationObserver, 59 public content::NotificationObserver,
60 public base::NonThreadSafe, 60 public base::NonThreadSafe,
61 public content::WebContentsUserData<CaptivePortalTabHelper> { 61 public content::WebContentsUserData<CaptivePortalTabHelper> {
62 public: 62 public:
63 virtual ~CaptivePortalTabHelper(); 63 virtual ~CaptivePortalTabHelper();
64 64
65 // content::WebContentsObserver: 65 // content::WebContentsObserver:
66 virtual void RenderViewDeleted( 66 virtual void RenderViewDeleted(
67 content::RenderViewHost* render_view_host) OVERRIDE; 67 content::RenderViewHost* render_view_host) override;
68 68
69 virtual void DidStartProvisionalLoadForFrame( 69 virtual void DidStartProvisionalLoadForFrame(
70 content::RenderFrameHost* render_frame_host, 70 content::RenderFrameHost* render_frame_host,
71 const GURL& validated_url, 71 const GURL& validated_url,
72 bool is_error_page, 72 bool is_error_page,
73 bool is_iframe_srcdoc) OVERRIDE; 73 bool is_iframe_srcdoc) override;
74 74
75 virtual void DidCommitProvisionalLoadForFrame( 75 virtual void DidCommitProvisionalLoadForFrame(
76 content::RenderFrameHost* render_frame_host, 76 content::RenderFrameHost* render_frame_host,
77 const GURL& url, 77 const GURL& url,
78 ui::PageTransition transition_type) OVERRIDE; 78 ui::PageTransition transition_type) override;
79 79
80 virtual void DidFailProvisionalLoad( 80 virtual void DidFailProvisionalLoad(
81 content::RenderFrameHost* render_frame_host, 81 content::RenderFrameHost* render_frame_host,
82 const GURL& validated_url, 82 const GURL& validated_url,
83 int error_code, 83 int error_code,
84 const base::string16& error_description) OVERRIDE; 84 const base::string16& error_description) override;
85 85
86 virtual void DidStopLoading( 86 virtual void DidStopLoading(
87 content::RenderViewHost* render_view_host) OVERRIDE; 87 content::RenderViewHost* render_view_host) override;
88 88
89 // content::NotificationObserver: 89 // content::NotificationObserver:
90 virtual void Observe( 90 virtual void Observe(
91 int type, 91 int type,
92 const content::NotificationSource& source, 92 const content::NotificationSource& source,
93 const content::NotificationDetails& details) OVERRIDE; 93 const content::NotificationDetails& details) override;
94 94
95 // Called when a certificate interstitial error page is about to be shown. 95 // Called when a certificate interstitial error page is about to be shown.
96 void OnSSLCertError(const net::SSLInfo& ssl_info); 96 void OnSSLCertError(const net::SSLInfo& ssl_info);
97 97
98 // A "Login Tab" is a tab that was originally at a captive portal login 98 // A "Login Tab" is a tab that was originally at a captive portal login
99 // page. This is set to false when a captive portal is no longer detected. 99 // page. This is set to false when a captive portal is no longer detected.
100 bool IsLoginTab() const; 100 bool IsLoginTab() const;
101 101
102 private: 102 private:
103 friend class CaptivePortalBrowserTest; 103 friend class CaptivePortalBrowserTest;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 // cross-process navitations. NULL when there's currently no provisional 152 // cross-process navitations. NULL when there's currently no provisional
153 // load. 153 // load.
154 content::RenderViewHost* provisional_render_view_host_; 154 content::RenderViewHost* provisional_render_view_host_;
155 155
156 content::NotificationRegistrar registrar_; 156 content::NotificationRegistrar registrar_;
157 157
158 DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabHelper); 158 DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabHelper);
159 }; 159 };
160 160
161 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_ 161 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698