| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/test_tab_contents.h" | 5 #include "content/browser/tab_contents/test_tab_contents.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "chrome/browser/browser_url_handler.h" | 9 #include "chrome/browser/browser_url_handler.h" |
| 10 #include "chrome/browser/tab_contents/infobar_delegate.h" | 10 #include "chrome/browser/tab_contents/infobar_delegate.h" |
| 11 #include "chrome/common/page_transition_types.h" | |
| 12 #include "content/browser/renderer_host/mock_render_process_host.h" | 11 #include "content/browser/renderer_host/mock_render_process_host.h" |
| 13 #include "content/browser/renderer_host/render_view_host.h" | 12 #include "content/browser/renderer_host/render_view_host.h" |
| 14 #include "content/browser/renderer_host/test_render_view_host.h" | 13 #include "content/browser/renderer_host/test_render_view_host.h" |
| 15 #include "content/browser/site_instance.h" | 14 #include "content/browser/site_instance.h" |
| 16 #include "content/common/notification_details.h" | 15 #include "content/common/notification_details.h" |
| 17 #include "content/common/notification_source.h" | 16 #include "content/common/notification_source.h" |
| 17 #include "content/common/page_transition_types.h" |
| 18 | 18 |
| 19 TestTabContents::TestTabContents(Profile* profile, SiteInstance* instance) | 19 TestTabContents::TestTabContents(Profile* profile, SiteInstance* instance) |
| 20 : TabContents(profile, instance, MSG_ROUTING_NONE, NULL, NULL), | 20 : TabContents(profile, instance, MSG_ROUTING_NONE, NULL, NULL), |
| 21 transition_cross_site(false) { | 21 transition_cross_site(false) { |
| 22 // Listen for infobar events so we can call InfoBarClosed() on the infobar | 22 // Listen for infobar events so we can call InfoBarClosed() on the infobar |
| 23 // delegates and give them an opportunity to delete themselves. (Since we | 23 // delegates and give them an opportunity to delete themselves. (Since we |
| 24 // have no InfobarContainer in TestTabContents, InfoBarClosed() is not called | 24 // have no InfobarContainer in TestTabContents, InfoBarClosed() is not called |
| 25 // most likely leading to the infobar delegates being leaked.) | 25 // most likely leading to the infobar delegates being leaked.) |
| 26 Source<TabContents> source(this); | 26 Source<TabContents> source(this); |
| 27 registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REMOVED, | 27 registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REMOVED, |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 static_cast<MockRenderProcessHost*>(rvh->process())->max_page_id() + 1; | 98 static_cast<MockRenderProcessHost*>(rvh->process())->max_page_id() + 1; |
| 99 } | 99 } |
| 100 rvh->SendNavigate(page_id, entry->url()); | 100 rvh->SendNavigate(page_id, entry->url()); |
| 101 } | 101 } |
| 102 | 102 |
| 103 void TestTabContents::ProceedWithCrossSiteNavigation() { | 103 void TestTabContents::ProceedWithCrossSiteNavigation() { |
| 104 if (!pending_rvh()) | 104 if (!pending_rvh()) |
| 105 return; | 105 return; |
| 106 render_manager_.ShouldClosePage(true, true); | 106 render_manager_.ShouldClosePage(true, true); |
| 107 } | 107 } |
| OLD | NEW |