Track "display" and "run" separately for mixed content, and make the latter d...

chrome/browser/external_tab_container.cc

-// Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/external_tab_container.h"
 
 #include <string>
 
 #include "app/win_util.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 731 matching lines @@
   nav_info->navigation_type = nav_type;
   nav_info->relative_offset = relative_offset;
   nav_info->navigation_index =
       tab_contents_->controller().GetCurrentEntryIndex();
   nav_info->url = entry->url();
   nav_info->title =  UTF16ToWideHack(entry->title());
   if (nav_info->title.empty())
     nav_info->title = UTF8ToWide(nav_info->url.spec());
 
   nav_info->security_style = entry->ssl().security_style();
-  nav_info->has_mixed_content = entry->ssl().has_mixed_content();
+  nav_info->displayed_mixed_content = entry->ssl().displayed_mixed_content();
+  nav_info->ran_mixed_content = entry->ssl().ran_mixed_content();
   return true;
 }
 
 scoped_refptr<ExternalTabContainer> ExternalTabContainer::RemovePendingTab(
     uintptr_t cookie) {
   PendingTabs::iterator index = pending_tabs_.find(cookie);
   if (index != pending_tabs_.end()) {
     scoped_refptr<ExternalTabContainer> container = (*index).second;
     pending_tabs_.erase(index);
     return container;
@@ skipping 192 matching lines @@
 
   layout->StartRow(0, 0);
   layout->AddView(info_bar_container);
   layout->StartRow(1, 0);
   layout->AddView(tab_contents_container_);
   SetContentsView(external_tab_view);
   // Note that SetTabContents must be called after AddChildView is called
   tab_contents_container_->ChangeTabContents(tab_contents_);
 }