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

Unified Diff: chrome/browser/interstitials/security_interstitial_page.cc

Issue 318213002: Add custom interstitial for captive portals. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mmenke comments, add login scenario to browser tests and fix race. Created 6 years, 1 month 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/interstitials/security_interstitial_page.cc
diff --git a/chrome/browser/interstitials/security_interstitial_page.cc b/chrome/browser/interstitials/security_interstitial_page.cc
index 513219631c1fa5c538f47cd014931887e123ff34..a259b21a1f34ba50cc96c2c8f00691376576c7a9 100644
--- a/chrome/browser/interstitials/security_interstitial_page.cc
+++ b/chrome/browser/interstitials/security_interstitial_page.cc
@@ -7,7 +7,6 @@
#include "base/i18n/rtl.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
-#include "chrome/grit/browser_resources.h"
#include "content/public/browser/interstitial_page.h"
#include "content/public/browser/web_contents.h"
#include "ui/base/resource/resource_bundle.h"
@@ -25,9 +24,6 @@ SecurityInterstitialPage::SecurityInterstitialPage(
// create it here.
}
-SecurityInterstitialPage::~SecurityInterstitialPage() {
-}
-
content::InterstitialPage* SecurityInterstitialPage::interstitial_page() const {
return interstitial_page_;
}
@@ -53,7 +49,7 @@ void SecurityInterstitialPage::Show() {
interstitial_page_->Show();
}
-base::string16 SecurityInterstitialPage::GetFormattedHostName() const {
+base::string16 SecurityInterstitialPage::GetFormattedHostName() {
base::string16 host(base::UTF8ToUTF16(request_url_.host()));
if (base::i18n::IsRTL())
base::i18n::WrapStringWithLTRFormatting(&host);

Powered by Google App Engine
This is Rietveld 408576698