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

Side by Side Diff: chrome_frame/chrome_active_document.cc

Issue 2063008: (Original patch reviewed at http://codereview.chromium.org/2067003 )... (Closed) Base URL: svn://chrome-svn/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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/data/ssl/page_with_mixed_contents.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Implementation of ChromeActiveDocument 5 // Implementation of ChromeActiveDocument
6 #include "chrome_frame/chrome_active_document.h" 6 #include "chrome_frame/chrome_active_document.h"
7 7
8 #include <hlink.h> 8 #include <hlink.h>
9 #include <htiface.h> 9 #include <htiface.h>
10 #include <initguid.h> 10 #include <initguid.h>
11 #include <mshtmcid.h> 11 #include <mshtmcid.h>
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 635
636 UpdateNavigationState(nav_info); 636 UpdateNavigationState(nav_info);
637 } 637 }
638 638
639 void ChromeActiveDocument::UpdateNavigationState( 639 void ChromeActiveDocument::UpdateNavigationState(
640 const IPC::NavigationInfo& new_navigation_info) { 640 const IPC::NavigationInfo& new_navigation_info) {
641 HRESULT hr = S_OK; 641 HRESULT hr = S_OK;
642 bool is_title_changed = (navigation_info_.title != new_navigation_info.title); 642 bool is_title_changed = (navigation_info_.title != new_navigation_info.title);
643 bool is_ssl_state_changed = 643 bool is_ssl_state_changed =
644 (navigation_info_.security_style != new_navigation_info.security_style) || 644 (navigation_info_.security_style != new_navigation_info.security_style) ||
645 (navigation_info_.has_mixed_content != 645 (navigation_info_.displayed_mixed_content !=
646 new_navigation_info.has_mixed_content); 646 new_navigation_info.displayed_mixed_content) ||
647 (navigation_info_.ran_mixed_content !=
648 new_navigation_info.ran_mixed_content);
647 649
648 if (is_ssl_state_changed) { 650 if (is_ssl_state_changed) {
649 int lock_status = SECURELOCK_SET_UNSECURE; 651 int lock_status = SECURELOCK_SET_UNSECURE;
650 switch (new_navigation_info.security_style) { 652 switch (new_navigation_info.security_style) {
651 case SECURITY_STYLE_AUTHENTICATION_BROKEN: 653 case SECURITY_STYLE_AUTHENTICATION_BROKEN:
652 lock_status = SECURELOCK_SET_SECUREUNKNOWNBIT; 654 lock_status = SECURELOCK_SET_SECUREUNKNOWNBIT;
653 break; 655 break;
654 case SECURITY_STYLE_AUTHENTICATED: 656 case SECURITY_STYLE_AUTHENTICATED:
655 lock_status = new_navigation_info.has_mixed_content ? 657 lock_status = new_navigation_info.displayed_mixed_content ?
656 SECURELOCK_SET_MIXED : SECURELOCK_SET_SECUREUNKNOWNBIT; 658 SECURELOCK_SET_MIXED : SECURELOCK_SET_SECUREUNKNOWNBIT;
657 break; 659 break;
658 default: 660 default:
659 break; 661 break;
660 } 662 }
661 663
662 ScopedVariant secure_lock_status(lock_status); 664 ScopedVariant secure_lock_status(lock_status);
663 IEExec(&CGID_ShellDocView, INTERNAL_CMDID_SET_SSL_LOCK, 665 IEExec(&CGID_ShellDocView, INTERNAL_CMDID_SET_SSL_LOCK,
664 OLECMDEXECOPT_DODEFAULT, secure_lock_status.AsInput(), NULL); 666 OLECMDEXECOPT_DODEFAULT, secure_lock_status.AsInput(), NULL);
665 } 667 }
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 ScopedComPtr<ITridentService2> trident_services; 1246 ScopedComPtr<ITridentService2> trident_services;
1245 trident_services.QueryFrom(shell_browser); 1247 trident_services.QueryFrom(shell_browser);
1246 if (trident_services) { 1248 if (trident_services) {
1247 trident_services->FirePrivacyImpactedStateChange(wparam); 1249 trident_services->FirePrivacyImpactedStateChange(wparam);
1248 } else { 1250 } else {
1249 NOTREACHED() << "Failed to retrieve IWebBrowser2 interface."; 1251 NOTREACHED() << "Failed to retrieve IWebBrowser2 interface.";
1250 } 1252 }
1251 return 0; 1253 return 0;
1252 } 1254 }
1253 1255
OLDNEW
« 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