OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/tab_contents/navigation_controller_impl.h" | 5 #include "content/browser/tab_contents/navigation_controller_impl.h" |
6 | 6 |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/string_number_conversions.h" // Temporary | 9 #include "base/string_number_conversions.h" // Temporary |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
774 temp.append("_"); | 774 temp.append("_"); |
775 if (entries_[i]->site_instance()) | 775 if (entries_[i]->site_instance()) |
776 temp.append(base::IntToString(entries_[i]->site_instance()->GetId())); | 776 temp.append(base::IntToString(entries_[i]->site_instance()->GetId())); |
777 else | 777 else |
778 temp.append("N"); | 778 temp.append("N"); |
779 if (entries_[i]->site_instance() != tab_contents_->GetSiteInstance()) | 779 if (entries_[i]->site_instance() != tab_contents_->GetSiteInstance()) |
780 temp.append("x"); | 780 temp.append("x"); |
781 temp.append(","); | 781 temp.append(","); |
782 } | 782 } |
783 GURL url(temp); | 783 GURL url(temp); |
784 tab_contents_->GetRenderViewHost()->Send(new ViewMsg_TempCrashWithData(url))
; | 784 static_cast<RenderViewHostImpl*>( |
| 785 tab_contents_->GetRenderViewHost())->Send( |
| 786 new ViewMsg_TempCrashWithData(url)); |
785 return content::NAVIGATION_TYPE_NAV_IGNORE; | 787 return content::NAVIGATION_TYPE_NAV_IGNORE; |
786 } | 788 } |
787 NavigationEntryImpl* existing_entry = entries_[existing_entry_index].get(); | 789 NavigationEntryImpl* existing_entry = entries_[existing_entry_index].get(); |
788 | 790 |
789 if (!content::PageTransitionIsMainFrame(params.transition)) { | 791 if (!content::PageTransitionIsMainFrame(params.transition)) { |
790 // All manual subframes would get new IDs and were handled above, so we | 792 // All manual subframes would get new IDs and were handled above, so we |
791 // know this is auto. Since the current page was found in the navigation | 793 // know this is auto. Since the current page was found in the navigation |
792 // entry list, we're guaranteed to have a last committed entry. | 794 // entry list, we're guaranteed to have a last committed entry. |
793 DCHECK(GetLastCommittedEntry()); | 795 DCHECK(GetLastCommittedEntry()); |
794 return content::NAVIGATION_TYPE_AUTO_SUBFRAME; | 796 return content::NAVIGATION_TYPE_AUTO_SUBFRAME; |
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1414 for (int i = 0; i < max_index; i++) { | 1416 for (int i = 0; i < max_index; i++) { |
1415 // When cloning a tab, copy all entries except interstitial pages | 1417 // When cloning a tab, copy all entries except interstitial pages |
1416 if (source.entries_[i].get()->GetPageType() != | 1418 if (source.entries_[i].get()->GetPageType() != |
1417 content::PAGE_TYPE_INTERSTITIAL) { | 1419 content::PAGE_TYPE_INTERSTITIAL) { |
1418 entries_.insert(entries_.begin() + insert_index++, | 1420 entries_.insert(entries_.begin() + insert_index++, |
1419 linked_ptr<NavigationEntryImpl>( | 1421 linked_ptr<NavigationEntryImpl>( |
1420 new NavigationEntryImpl(*source.entries_[i]))); | 1422 new NavigationEntryImpl(*source.entries_[i]))); |
1421 } | 1423 } |
1422 } | 1424 } |
1423 } | 1425 } |
OLD | NEW |