OLD | NEW |
1 // Copyright (c) 2006-2008 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 #include "chrome/browser/external_tab_container.h" | 5 #include "chrome/browser/external_tab_container.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "app/win_util.h" | 9 #include "app/win_util.h" |
10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
743 nav_info->navigation_type = nav_type; | 743 nav_info->navigation_type = nav_type; |
744 nav_info->relative_offset = relative_offset; | 744 nav_info->relative_offset = relative_offset; |
745 nav_info->navigation_index = | 745 nav_info->navigation_index = |
746 tab_contents_->controller().GetCurrentEntryIndex(); | 746 tab_contents_->controller().GetCurrentEntryIndex(); |
747 nav_info->url = entry->url(); | 747 nav_info->url = entry->url(); |
748 nav_info->title = UTF16ToWideHack(entry->title()); | 748 nav_info->title = UTF16ToWideHack(entry->title()); |
749 if (nav_info->title.empty()) | 749 if (nav_info->title.empty()) |
750 nav_info->title = UTF8ToWide(nav_info->url.spec()); | 750 nav_info->title = UTF8ToWide(nav_info->url.spec()); |
751 | 751 |
752 nav_info->security_style = entry->ssl().security_style(); | 752 nav_info->security_style = entry->ssl().security_style(); |
753 nav_info->has_mixed_content = entry->ssl().has_mixed_content(); | 753 nav_info->displayed_mixed_content = entry->ssl().displayed_mixed_content(); |
| 754 nav_info->ran_mixed_content = entry->ssl().ran_mixed_content(); |
754 return true; | 755 return true; |
755 } | 756 } |
756 | 757 |
757 scoped_refptr<ExternalTabContainer> ExternalTabContainer::RemovePendingTab( | 758 scoped_refptr<ExternalTabContainer> ExternalTabContainer::RemovePendingTab( |
758 uintptr_t cookie) { | 759 uintptr_t cookie) { |
759 PendingTabs::iterator index = pending_tabs_.find(cookie); | 760 PendingTabs::iterator index = pending_tabs_.find(cookie); |
760 if (index != pending_tabs_.end()) { | 761 if (index != pending_tabs_.end()) { |
761 scoped_refptr<ExternalTabContainer> container = (*index).second; | 762 scoped_refptr<ExternalTabContainer> container = (*index).second; |
762 pending_tabs_.erase(index); | 763 pending_tabs_.erase(index); |
763 return container; | 764 return container; |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
956 | 957 |
957 layout->StartRow(0, 0); | 958 layout->StartRow(0, 0); |
958 layout->AddView(info_bar_container); | 959 layout->AddView(info_bar_container); |
959 layout->StartRow(1, 0); | 960 layout->StartRow(1, 0); |
960 layout->AddView(tab_contents_container_); | 961 layout->AddView(tab_contents_container_); |
961 SetContentsView(external_tab_view); | 962 SetContentsView(external_tab_view); |
962 // Note that SetTabContents must be called after AddChildView is called | 963 // Note that SetTabContents must be called after AddChildView is called |
963 tab_contents_container_->ChangeTabContents(tab_contents_); | 964 tab_contents_container_->ChangeTabContents(tab_contents_); |
964 } | 965 } |
965 | 966 |
OLD | NEW |