Remove more dead code/strings relating to mixed/unsafe content.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2098001

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

4 files changed, 3 insertions, 36 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 3cec4d0..b12c05e 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -2365,24 +2365,6 @@ each locale. -->
       <message name="IDS_SEVERAL_SSL_ERRORS" desc="Bubble info header text when there is more than 1 error">
         There are several SSL errors on this page:
       </message>
-      <message name="IDS_SSL_MIXED_CONTENT_TITLE" desc="Title for mixed SSL / non-SSL content">
-        This page contains insecure content.
-      </message>
-      <message name="IDS_SSL_MIXED_CONTENT_DESCRIPTION" desc="Description for mixed SSL / non-SSL content">
-        This page contains some insecure content
-      </message>
-      <message name="IDS_SSL_MIXED_CONTENT_DETAILS" desc="Description for mixed SSL / non-SSL content">
-        This page is not retrieved entirely over a secure connection.  It contains some content retrieved over insecure connections.
-      </message>
-      <message name="IDS_SSL_UNSAFE_CONTENT_TITLE" desc="Title for broken https resources in safe SSL page">
-        This page contains insecure content.
-      </message>
-      <message name="IDS_SSL_UNSAFE_CONTENT_DESCRIPTION" desc="Description for broken https resources in safe SSL page">
-        This page contains some insecure content
-      </message>
-      <message name="IDS_SSL_UNSAFE_CONTENT_DETAILS" desc="Title for broken https resources in safe SSL page">
-        Some content on this page was retrieved over a connection with SSL errors.
-      </message>
 
       <!-- Certificate error strings -->
       <message name="IDS_CERT_ERROR_EXTRA_INFO_TITLE" desc="The title for the extra information section displayed when a page contains a certificate error">
diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc
index 1681bf7..14ffa4b 100644
--- a/chrome/browser/ssl/ssl_error_info.cc
+++ b/chrome/browser/ssl/ssl_error_info.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -167,18 +167,6 @@ SSLErrorInfo SSLErrorInfo::CreateError(ErrorType error_type,
           l10n_util::GetString(
               IDS_CERT_ERROR_WEAK_SIGNATURE_ALGORITHM_EXTRA_INFO_2));
       break;
-    case MIXED_CONTENTS:
-      title = l10n_util::GetString(IDS_SSL_MIXED_CONTENT_TITLE);
-      details = l10n_util::GetString(IDS_SSL_MIXED_CONTENT_DETAILS);
-      short_description =
-          l10n_util::GetString(IDS_SSL_MIXED_CONTENT_DESCRIPTION);
-      break;
-    case UNSAFE_CONTENTS:
-      title = l10n_util::GetString(IDS_SSL_UNSAFE_CONTENT_TITLE);
-      details = l10n_util::GetString(IDS_SSL_UNSAFE_CONTENT_DETAILS);
-      short_description =
-          l10n_util::GetString(IDS_SSL_UNSAFE_CONTENT_DESCRIPTION);
-      break;
     case UNKNOWN:
       title = l10n_util::GetString(IDS_CERT_ERROR_UNKNOWN_ERROR_TITLE);
       details = l10n_util::GetString(IDS_CERT_ERROR_UNKNOWN_ERROR_DETAILS);
diff --git a/chrome/browser/ssl/ssl_error_info.h b/chrome/browser/ssl/ssl_error_info.h
index c3f9b63..1c8742b 100644
--- a/chrome/browser/ssl/ssl_error_info.h
+++ b/chrome/browser/ssl/ssl_error_info.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -28,8 +28,6 @@ class SSLErrorInfo {
     CERT_REVOKED,
     CERT_INVALID,
     CERT_WEAK_SIGNATURE_ALGORITHM,
-    MIXED_CONTENTS,
-    UNSAFE_CONTENTS,
     UNKNOWN
   };
 
diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h
index 503f1f1..7aaa5e0 100644
--- a/chrome/browser/tab_contents/navigation_entry.h
+++ b/chrome/browser/tab_contents/navigation_entry.h
@@ -37,9 +37,8 @@ class NavigationEntry {
    public:
     // Flags used for the page security content status.
     enum ContentStatusFlags {
-      NORMAL_CONTENT = 0,       // Neither of the 2 cases below.
+      NORMAL_CONTENT = 0,       // No mixed content.
       MIXED_CONTENT  = 1 << 0,  // https page containing http resources.
-      UNSAFE_CONTENT = 1 << 1   // https page containing broken https resources.
     };
 
     SSLStatus();