diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-15 02:59:07 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-15 02:59:07 +0000 |
| commit | 132048857e69b3f07e7d50bda996d1923c9c8e7b (patch) | |
| tree | d98c67ef93da6b9cd31acf1532e6f2dbba18a97c /chrome_frame/chrome_active_document.cc | |
| parent | f3b6d491f7f4233b4862f7352f6ed477f3f1e95a (diff) | |
| download | chromium_src-132048857e69b3f07e7d50bda996d1923c9c8e7b.zip chromium_src-132048857e69b3f07e7d50bda996d1923c9c8e7b.tar.gz chromium_src-132048857e69b3f07e7d50bda996d1923c9c8e7b.tar.bz2 | |
Revert 47347 - (Original patch reviewed at http://codereview.chromium.org/2067003 )
Track "display" and "run" separately for mixed content, and make the latter downgrade the SSL state to "authentication broken".
Make the "display" state only affect the current tab (not the entire host).
Fix an SSL browser test by supplying the appropriate SiteInstance*.
Move a test from "disabled" to "flaky" since it at least passes for me.
Make the SSLManager header and .cc files put functions in the same order, and make that order somewhat saner.
Falied TestGoodFrameNavigation on Mac 10.5 browser tests
among other things:
/b/slave/chromium-rel-mac-builder/build/src/chrome/browser/ssl/ssl_browser_tests.cc:43: Failure
Value of: entry->ssl().displayed_mixed_content()
Actual: false
Expected: displayed_mixed_content
Which is: true
BUG=15072, 18626, 40932, 42758
TEST=Covered by browser tests
Review URL: http://codereview.chromium.org/2063008
TBR=pkasting@chromium.org
Review URL: http://codereview.chromium.org/2095006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47357 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_active_document.cc')
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index d289c54..aa8b07a 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -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 @@ void ChromeActiveDocument::UpdateNavigationState( 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 @@ void ChromeActiveDocument::UpdateNavigationState( 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: |