Reverting 16164.

Review URL: http://codereview.chromium.org/113471

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16165 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 25 insertions, 19 deletions

diff --git a/chrome/browser/ssl/ssl_policy_backend.h b/chrome/browser/ssl/ssl_policy_backend.h
index 5b59a7c..f8a829c 100644
--- a/chrome/browser/ssl/ssl_policy_backend.h
+++ b/chrome/browser/ssl/ssl_policy_backend.h
@@ -20,56 +20,62 @@ class Task;
 class SSLPolicyBackend {
  public:
   explicit SSLPolicyBackend(NavigationController* controller);
-  virtual ~SSLPolicyBackend();
 
   // Ensure that the specified message is displayed to the user.  This will
   // display an InfoBar at the top of the associated tab.
-  virtual void ShowMessage(const std::wstring& msg);
+  void ShowMessage(const std::wstring& msg);
 
   // Same as ShowMessage but also contains a link that when clicked run the
   // specified task.  The SSL Manager becomes the owner of the task.
-  virtual void ShowMessageWithLink(const std::wstring& msg,
-                                   const std::wstring& link_text,
-                                   Task* task);
+  void ShowMessageWithLink(const std::wstring& msg,
+                           const std::wstring& link_text,
+                           Task* task);
 
   // Records that a host is "broken," that is, the origin for that host has been
   // contaminated with insecure content, either via HTTP or via HTTPS with a
   // bad certificate.
-  virtual void MarkHostAsBroken(const std::string& host, int pid);
+  void MarkHostAsBroken(const std::string& host, int pid);
 
   // Returns whether the specified host was marked as broken.
-  virtual bool DidMarkHostAsBroken(const std::string& host, int pid) const;
+  bool DidMarkHostAsBroken(const std::string& host, int pid) const;
+
+  // Sets the maximum security style for the page.  If the current security
+  // style is lower than |style|, this will not have an effect on the security
+  // indicators.
+  //
+  // It will return true if the navigation entry was updated or false if
+  // nothing changed. The caller is responsible for broadcasting
+  // NOTIFY_SSY_STATE_CHANGED if it returns true.
+  bool SetMaxSecurityStyle(SecurityStyle style);
 
   // Logs a message to the console of the page.
-  virtual void AddMessageToConsole(const string16& message,
-                                   const WebKit::WebConsoleMessage::Level&);
+  void AddMessageToConsole(const string16& message,
+                           const WebKit::WebConsoleMessage::Level&);
 
   // Records that |cert| is permitted to be used for |host| in the future.
-  virtual void DenyCertForHost(net::X509Certificate* cert,
-                               const std::string& host);
+  void DenyCertForHost(net::X509Certificate* cert, const std::string& host);
 
   // Records that |cert| is not permitted to be used for |host| in the future.
-  virtual void AllowCertForHost(net::X509Certificate* cert,
-                                const std::string& host);
+  void AllowCertForHost(net::X509Certificate* cert, const std::string& host);
 
   // Queries whether |cert| is allowed or denied for |host|.
-  virtual net::X509Certificate::Policy::Judgment QueryPolicy(
+  net::X509Certificate::Policy::Judgment QueryPolicy(
       net::X509Certificate* cert, const std::string& host);
 
   // Allow mixed content to be visible (non filtered).
-  virtual void AllowMixedContentForHost(const std::string& host);
+  void AllowMixedContentForHost(const std::string& host);
 
   // Returns whether the specified host is allowed to show mixed content.
-  virtual bool DidAllowMixedContentForHost(const std::string& host) const;
+  bool DidAllowMixedContentForHost(const std::string& host) const;
 
   // Reloads the tab.
-  virtual void Reload();
+  void Reload();
 
   // Shows the pending messages (in info-bars) if any.
-  virtual void ShowPendingMessages();
+  void ShowPendingMessages();
 
   // Clears any pending messages.
-  virtual void ClearPendingMessages();
+  void ClearPendingMessages();
 
  private:
   // SSLMessageInfo contains the information necessary for displaying a message