diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 18:28:48 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 18:28:48 +0000 |
| commit | b4e75c12dacc0922694b12b687a48dd2d973b595 (patch) | |
| tree | 23d65e13ccf2fd9535ffb7ad965c5f2826efd6cc /chrome_frame | |
| parent | 15ad5dcb44ab2049103f738625e4e5f2483d85da (diff) | |
| download | chromium_src-b4e75c12dacc0922694b12b687a48dd2d973b595.zip chromium_src-b4e75c12dacc0922694b12b687a48dd2d973b595.tar.gz chromium_src-b4e75c12dacc0922694b12b687a48dd2d973b595.tar.bz2 | |
Rename "mixed content" to "insecure content" in as many places as possible, to standardize on a consistent naming scheme.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2069005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 10 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame_activex.cc | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index d289c54..3dab106 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -642,10 +642,10 @@ 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_.displayed_insecure_content != + new_navigation_info.displayed_insecure_content) || + (navigation_info_.ran_insecure_content != + new_navigation_info.ran_insecure_content); if (is_ssl_state_changed) { int lock_status = SECURELOCK_SET_UNSECURE; @@ -654,7 +654,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.displayed_insecure_content ? SECURELOCK_SET_MIXED : SECURELOCK_SET_SECUREUNKNOWNBIT; break; default: diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index eb1283a..fb8721d 100644 --- a/chrome_frame/chrome_frame_activex.cc +++ b/chrome_frame/chrome_frame_activex.cc @@ -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. @@ -365,7 +365,7 @@ STDMETHODIMP ChromeFrameActivex::Load(IPropertyBag* bag, IErrorLog* error_log) { return hr; } -const wchar_t g_activex_mixed_content_error[] = { +const wchar_t g_activex_insecure_content_error[] = { L"data:text/html,<html><body><b>ChromeFrame Security Error<br><br>" L"Cannot navigate to HTTP url when document URL is HTTPS</body></html>"}; @@ -374,7 +374,7 @@ STDMETHODIMP ChromeFrameActivex::put_src(BSTR src) { if (document_url.SchemeIsSecure()) { GURL source_url(src); if (!source_url.SchemeIsSecure()) { - Base::put_src(ScopedBstr(g_activex_mixed_content_error)); + Base::put_src(ScopedBstr(g_activex_insecure_content_error)); return E_ACCESSDENIED; } } |