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

Unified Diff: chrome/browser/ssl/ssl_blocking_page.h

Issue 9323071: Use InterstitialPage through a delegate interface instead of deriving from it. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix cros Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ssl/ssl_blocking_page.h
===================================================================
--- chrome/browser/ssl/ssl_blocking_page.h (revision 120733)
+++ chrome/browser/ssl/ssl_blocking_page.h (working copy)
@@ -11,18 +11,24 @@
#include "base/callback.h"
#include "base/string16.h"
-#include "chrome/browser/tab_contents/chrome_interstitial_page.h"
+#include "content/public/browser/interstitial_page_delegate.h"
+class GURL;
+class InterstitialPage;
class SSLCertErrorHandler;
namespace base {
class DictionaryValue;
}
+namespace content {
+class WebContents;
+}
+
// This class is responsible for showing/hiding the interstitial page that is
// shown when a certificate error happens.
// It deletes itself when the interstitial page is closed.
-class SSLBlockingPage : public ChromeInterstitialPage {
+class SSLBlockingPage : public content::InterstitialPageDelegate {
public:
SSLBlockingPage(
SSLCertErrorHandler* handler,
@@ -38,12 +44,14 @@
const std::vector<string16>& extra_info);
protected:
- // ChromeInterstitialPage implementation.
+ // InterstitialPageDelegate implementation.
virtual std::string GetHTMLContents() OVERRIDE;
virtual void CommandReceived(const std::string& command) OVERRIDE;
- virtual void UpdateEntry(content::NavigationEntry* entry) OVERRIDE;
- virtual void Proceed() OVERRIDE;
- virtual void DontProceed() OVERRIDE;
+ virtual void OverrideEntry(content::NavigationEntry* entry) OVERRIDE;
+ virtual void OverrideRendererPrefs(
+ content::RendererPreferences* prefs) OVERRIDE;
+ virtual void OnProceed() OVERRIDE;
+ virtual void OnDontProceed() OVERRIDE;
private:
void NotifyDenyCertificate();
@@ -58,6 +66,9 @@
// Is the certificate error overridable or fatal?
bool overridable_;
+ content::WebContents* web_contents_;
+ InterstitialPage* interstitial_page_; // Owns us.
+
DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
};
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc ('k') | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698