Revert 47347 - (Original patch reviewed at http://codereview.chromium.org/206...

chrome/browser/tab_contents/navigation_entry.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
 #define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 19 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 class NavigationEntry {
  public:
   // SSL -----------------------------------------------------------------------
 
   // Collects the SSL information for this NavigationEntry.
   class SSLStatus {
    public:
     // Flags used for the page security content status.
     enum ContentStatusFlags {
-      // HTTP page, or HTTPS page with no insecure content.
-      NORMAL_CONTENT          = 0,
-
-      // HTTPS page containing "displayed" HTTP resources (e.g. images, CSS).
-      DISPLAYED_MIXED_CONTENT = 1 << 0,
-
-      // HTTPS page containing "executed" HTTP resources (i.e. script).
-      // Also currently used for HTTPS page containing broken-HTTPS resources;
-      // this is wrong and should be fixed (see comments in
-      // SSLPolicy::OnRequestStarted()).
-      RAN_MIXED_CONTENT       = 1 << 1,
+      NORMAL_CONTENT = 0,       // No mixed content.
+      MIXED_CONTENT  = 1 << 0,  // https page containing http resources.
     };
 
     SSLStatus();
 
     bool Equals(const SSLStatus& status) const {
       return security_style_ == status.security_style_ &&
              cert_id_ == status.cert_id_ &&
              cert_status_ == status.cert_status_ &&
              security_bits_ == status.security_bits_ &&
              content_status_ == status.content_status_;
@@ skipping 20 matching lines @@
       return cert_status_;
     }
 
     void set_security_bits(int security_bits) {
       security_bits_ = security_bits;
     }
     int security_bits() const {
       return security_bits_;
     }
 
-    void set_displayed_mixed_content() {
-      content_status_ |= DISPLAYED_MIXED_CONTENT;
+    // Mixed content means that this page which is served over https contains
+    // http sub-resources.
+    void set_has_mixed_content() {
+      content_status_ |= MIXED_CONTENT;
     }
-    bool displayed_mixed_content() const {
-      return (content_status_ & DISPLAYED_MIXED_CONTENT) != 0;
-    }
-
-    void set_ran_mixed_content() {
-      content_status_ |= RAN_MIXED_CONTENT;
-    }
-    bool ran_mixed_content() const {
-      return (content_status_ & RAN_MIXED_CONTENT) != 0;
+    bool has_mixed_content() const {
+      return (content_status_ & MIXED_CONTENT) != 0;
     }
 
     // Raw accessors for all the content status flags. This contains a
     // combination of any of the ContentStatusFlags defined above. It is used
     // by some tests for checking and for certain copying. Use the per-status
     // functions for normal usage.
     void set_content_status(int content_status) {
       content_status_ = content_status;
     }
     int content_status() const {
@@ skipping 308 matching lines @@
   // This is a cached version of the result of GetTitleForDisplay. It prevents
   // us from having to do URL formatting on the URL evey time the title is
   // displayed. When the URL, virtual URL, or title is set, this should be
   // cleared to force a refresh.
   string16 cached_display_title_;
 
   // Copy and assignment is explicitly allowed for this class.
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_