Track "display" and "run" separately for mixed content, and make the latter d...

chrome_frame/chrome_active_document.cc

-// Copyright (c) 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.
 
 // Implementation of ChromeActiveDocument
 #include "chrome_frame/chrome_active_document.h"
 
 #include <hlink.h>
 #include <htiface.h>
 #include <initguid.h>
 #include <mshtmcid.h>
@@ skipping 622 matching lines @@
 
   UpdateNavigationState(nav_info);
 }
 
 void ChromeActiveDocument::UpdateNavigationState(
     const IPC::NavigationInfo& new_navigation_info) {
   HRESULT hr = S_OK;
   bool is_title_changed = (navigation_info_.title != new_navigation_info.title);
   bool is_ssl_state_changed =
       (navigation_info_.security_style != new_navigation_info.security_style) ||
-      (navigation_info_.has_mixed_content !=
-          new_navigation_info.has_mixed_content);
+      (navigation_info_.displayed_mixed_content !=
+          new_navigation_info.displayed_mixed_content) ||
+      (navigation_info_.ran_mixed_content !=
+          new_navigation_info.ran_mixed_content);
 
   if (is_ssl_state_changed) {
     int lock_status = SECURELOCK_SET_UNSECURE;
     switch (new_navigation_info.security_style) {
       case SECURITY_STYLE_AUTHENTICATION_BROKEN:
         lock_status = SECURELOCK_SET_SECUREUNKNOWNBIT;
         break;
       case SECURITY_STYLE_AUTHENTICATED:
-        lock_status = new_navigation_info.has_mixed_content ?
+        lock_status = new_navigation_info.displayed_mixed_content ?
             SECURELOCK_SET_MIXED : SECURELOCK_SET_SECUREUNKNOWNBIT;
         break;
       default:
         break;
     }
 
     ScopedVariant secure_lock_status(lock_status);
     IEExec(&CGID_ShellDocView, INTERNAL_CMDID_SET_SSL_LOCK,
            OLECMDEXECOPT_DODEFAULT, secure_lock_status.AsInput(), NULL);
   }
@@ skipping 585 matching lines @@
   ScopedComPtr<ITridentService2> trident_services;
   trident_services.QueryFrom(shell_browser);
   if (trident_services) {
     trident_services->FirePrivacyImpactedStateChange(wparam);
   } else {
     NOTREACHED() << "Failed to retrieve IWebBrowser2 interface.";
   }
   return 0;
 }