| Index: chrome/browser/interstitials/security_interstitial_page.h
|
| diff --git a/chrome/browser/interstitials/security_interstitial_page.h b/chrome/browser/interstitials/security_interstitial_page.h
|
| index 2a9a9d2dbb9050600952dfb0e76086044e958ed9..965154a1783f6cfe4cce83cecd985061dbc407d8 100644
|
| --- a/chrome/browser/interstitials/security_interstitial_page.h
|
| +++ b/chrome/browser/interstitials/security_interstitial_page.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/strings/string16.h"
|
| #include "content/public/browser/interstitial_page_delegate.h"
|
| +#include "grit/browser_resources.h"
|
| #include "url/gurl.h"
|
|
|
| namespace base {
|
| @@ -22,7 +23,7 @@ class SecurityInterstitialPage : public content::InterstitialPageDelegate {
|
| public:
|
| SecurityInterstitialPage(content::WebContents* web_contents,
|
| const GURL& url);
|
| - virtual ~SecurityInterstitialPage();
|
| + virtual ~SecurityInterstitialPage() {}
|
|
|
| // Creates an interstitial and shows it.
|
| virtual void Show();
|
| @@ -42,10 +43,10 @@ class SecurityInterstitialPage : public content::InterstitialPageDelegate {
|
| base::DictionaryValue* load_time_data) = 0;
|
|
|
| // InterstitialPageDelegate method:
|
| - std::string GetHTMLContents() override;
|
| + virtual std::string GetHTMLContents() override;
|
|
|
| // Returns the formatted host name for the request url.
|
| - base::string16 GetFormattedHostName() const;
|
| + base::string16 GetFormattedHostName();
|
|
|
| content::InterstitialPage* interstitial_page() const;
|
| content::WebContents* web_contents() const;
|
| @@ -54,13 +55,11 @@ class SecurityInterstitialPage : public content::InterstitialPageDelegate {
|
| private:
|
| content::WebContents* web_contents_;
|
| const GURL request_url_;
|
| - // Once shown, |interstitial_page| takes ownership of this
|
| + // Once shown, interstitial_page takes ownership of this
|
| // SecurityInterstitialPage instance.
|
| content::InterstitialPage* interstitial_page_;
|
| // Whether the interstitial should create a view.
|
| bool create_view_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(SecurityInterstitialPage);
|
| };
|
|
|
| #endif // CHROME_BROWSER_INTERSTITIALS_SECURITY_INTERSTITIAL_PAGE_H_
|
|
|