Index: chrome_frame/chrome_active_document.cc |
=================================================================== |
--- chrome_frame/chrome_active_document.cc (revision 47426) |
+++ chrome_frame/chrome_active_document.cc (working copy) |
@@ -1,4 +1,4 @@ |
-// 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. |
@@ -642,8 +642,10 @@ |
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; |
@@ -652,7 +654,7 @@ |
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: |