Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6451)

Unified Diff: chrome_frame/chrome_active_document.cc

Issue 2095006: Revert 47347 - (Original patch reviewed at http://codereview.chromium.org/206... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/data/ssl/page_with_mixed_contents.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_active_document.cc
===================================================================
--- chrome_frame/chrome_active_document.cc (revision 47356)
+++ chrome_frame/chrome_active_document.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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,10 +642,8 @@
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_.displayed_mixed_content !=
- new_navigation_info.displayed_mixed_content) ||
- (navigation_info_.ran_mixed_content !=
- new_navigation_info.ran_mixed_content);
+ (navigation_info_.has_mixed_content !=
+ new_navigation_info.has_mixed_content);
if (is_ssl_state_changed) {
int lock_status = SECURELOCK_SET_UNSECURE;
@@ -654,7 +652,7 @@
lock_status = SECURELOCK_SET_SECUREUNKNOWNBIT;
break;
case SECURITY_STYLE_AUTHENTICATED:
- lock_status = new_navigation_info.displayed_mixed_content ?
+ lock_status = new_navigation_info.has_mixed_content ?
SECURELOCK_SET_MIXED : SECURELOCK_SET_SECUREUNKNOWNBIT;
break;
default:
« no previous file with comments | « chrome/test/data/ssl/page_with_mixed_contents.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698