OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ | 5 #ifndef CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ |
6 #define CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ | 6 #define CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/gfx/size.h" | 10 #include "base/gfx/size.h" |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 // The tab in which we are displayed. | 144 // The tab in which we are displayed. |
145 WebContents* tab_; | 145 WebContents* tab_; |
146 | 146 |
147 // The URL that is shown when the interstitial is showing. | 147 // The URL that is shown when the interstitial is showing. |
148 GURL url_; | 148 GURL url_; |
149 | 149 |
150 // Whether this interstitial is shown as a result of a new navigation (in | 150 // Whether this interstitial is shown as a result of a new navigation (in |
151 // which case a transient navigation entry is created). | 151 // which case a transient navigation entry is created). |
152 bool new_navigation_; | 152 bool new_navigation_; |
153 | 153 |
| 154 // Whether we should discard the pending navigation entry when not proceeding. |
| 155 // This is to deal with cases where |new_navigation_| is true but a new |
| 156 // pending entry was created since this interstitial was shown and we should |
| 157 // not discard it. |
| 158 bool should_discard_pending_nav_entry_; |
| 159 |
154 // Whether this interstitial is enabled. See Disable() for more info. | 160 // Whether this interstitial is enabled. See Disable() for more info. |
155 bool enabled_; | 161 bool enabled_; |
156 | 162 |
157 // Whether the Proceed or DontProceed have been called yet. | 163 // Whether the Proceed or DontProceed have been called yet. |
158 bool action_taken_; | 164 bool action_taken_; |
159 | 165 |
160 // Notification magic. | 166 // Notification magic. |
161 NotificationRegistrar notification_registrar_; | 167 NotificationRegistrar notification_registrar_; |
162 | 168 |
163 // The RenderViewHost displaying the interstitial contents. | 169 // The RenderViewHost displaying the interstitial contents. |
(...skipping 22 matching lines...) Expand all Loading... |
186 | 192 |
187 // We keep a map of the various blocking pages shown as the UI tests need to | 193 // We keep a map of the various blocking pages shown as the UI tests need to |
188 // be able to retrieve them. | 194 // be able to retrieve them. |
189 typedef std::map<WebContents*,InterstitialPage*> InterstitialPageMap; | 195 typedef std::map<WebContents*,InterstitialPage*> InterstitialPageMap; |
190 static InterstitialPageMap* tab_to_interstitial_page_; | 196 static InterstitialPageMap* tab_to_interstitial_page_; |
191 | 197 |
192 DISALLOW_COPY_AND_ASSIGN(InterstitialPage); | 198 DISALLOW_COPY_AND_ASSIGN(InterstitialPage); |
193 }; | 199 }; |
194 | 200 |
195 #endif // #ifndef CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ | 201 #endif // #ifndef CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ |
OLD | NEW |