| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/files/file_path.h" | 5 #include "base/files/file_path.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "content/browser/frame_host/cross_site_transferring_request.h" | 7 #include "content/browser/frame_host/cross_site_transferring_request.h" |
| 8 #include "content/browser/frame_host/navigation_controller_impl.h" | 8 #include "content/browser/frame_host/navigation_controller_impl.h" |
| 9 #include "content/browser/frame_host/navigation_entry_impl.h" | 9 #include "content/browser/frame_host/navigation_entry_impl.h" |
| 10 #include "content/browser/frame_host/navigator.h" | 10 #include "content/browser/frame_host/navigator.h" |
| (...skipping 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1058 | 1058 |
| 1059 // It's important that the site instance get set on the Web UI page as soon | 1059 // It's important that the site instance get set on the Web UI page as soon |
| 1060 // as the navigation starts, rather than lazily after it commits, so we don't | 1060 // as the navigation starts, rather than lazily after it commits, so we don't |
| 1061 // try to re-use the SiteInstance/process for non Web UI things that may | 1061 // try to re-use the SiteInstance/process for non Web UI things that may |
| 1062 // get loaded in between. | 1062 // get loaded in between. |
| 1063 EXPECT_TRUE(static_cast<SiteInstanceImpl*>(host->GetSiteInstance())-> | 1063 EXPECT_TRUE(static_cast<SiteInstanceImpl*>(host->GetSiteInstance())-> |
| 1064 HasSite()); | 1064 HasSite()); |
| 1065 EXPECT_EQ(kUrl, host->GetSiteInstance()->GetSiteURL()); | 1065 EXPECT_EQ(kUrl, host->GetSiteInstance()->GetSiteURL()); |
| 1066 | 1066 |
| 1067 // The Web UI is committed immediately because the RenderViewHost has not been | 1067 // The Web UI is committed immediately because the RenderViewHost has not been |
| 1068 // used yet. UpdateRendererStateForNavigate() took the short cut path. | 1068 // used yet. UpdateStateForNavigate() took the short cut path. |
| 1069 EXPECT_FALSE(manager->pending_web_ui()); | 1069 EXPECT_FALSE(manager->pending_web_ui()); |
| 1070 EXPECT_TRUE(manager->web_ui()); | 1070 EXPECT_TRUE(manager->web_ui()); |
| 1071 | 1071 |
| 1072 // Commit. | 1072 // Commit. |
| 1073 manager->DidNavigateFrame(host); | 1073 manager->DidNavigateFrame(host); |
| 1074 EXPECT_TRUE( | 1074 EXPECT_TRUE( |
| 1075 host->render_view_host()->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI); | 1075 host->render_view_host()->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI); |
| 1076 } | 1076 } |
| 1077 | 1077 |
| 1078 // Tests that we can open a WebUI link in a new tab from a WebUI page and still | 1078 // Tests that we can open a WebUI link in a new tab from a WebUI page and still |
| (...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1841 pending_rfh->GetSiteInstance())->increment_active_view_count(); | 1841 pending_rfh->GetSiteInstance())->increment_active_view_count(); |
| 1842 | 1842 |
| 1843 main_test_rfh()->OnMessageReceived( | 1843 main_test_rfh()->OnMessageReceived( |
| 1844 FrameHostMsg_BeforeUnload_ACK(0, false, now, now)); | 1844 FrameHostMsg_BeforeUnload_ACK(0, false, now, now)); |
| 1845 EXPECT_FALSE(contents()->cross_navigation_pending()); | 1845 EXPECT_FALSE(contents()->cross_navigation_pending()); |
| 1846 EXPECT_FALSE(rvh_deleted_observer.deleted()); | 1846 EXPECT_FALSE(rvh_deleted_observer.deleted()); |
| 1847 } | 1847 } |
| 1848 } | 1848 } |
| 1849 | 1849 |
| 1850 } // namespace content | 1850 } // namespace content |
| OLD | NEW |