| 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 "base/logging.h" | 5 #include "base/logging.h" |
| 6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "content/browser/renderer_host/frame_tree_node.h" | 7 #include "content/browser/renderer_host/frame_tree_node.h" |
| 8 #include "content/browser/renderer_host/render_view_host_impl.h" | 8 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 9 #include "content/browser/renderer_host/test_render_view_host.h" | 9 #include "content/browser/renderer_host/test_render_view_host.h" |
| 10 #include "content/browser/site_instance_impl.h" | 10 #include "content/browser/site_instance_impl.h" |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 } | 177 } |
| 178 | 178 |
| 179 void set_delegate(Delegate* delegate) { | 179 void set_delegate(Delegate* delegate) { |
| 180 delegate_ = delegate; | 180 delegate_ = delegate; |
| 181 } | 181 } |
| 182 | 182 |
| 183 protected: | 183 protected: |
| 184 virtual RenderViewHost* CreateRenderViewHost() OVERRIDE { | 184 virtual RenderViewHost* CreateRenderViewHost() OVERRIDE { |
| 185 return new TestRenderViewHost( | 185 return new TestRenderViewHost( |
| 186 SiteInstance::Create(web_contents()->GetBrowserContext()), | 186 SiteInstance::Create(web_contents()->GetBrowserContext()), |
| 187 this, this, MSG_ROUTING_NONE, false); | 187 this, this, MSG_ROUTING_NONE, MSG_ROUTING_NONE, false); |
| 188 } | 188 } |
| 189 | 189 |
| 190 virtual WebContentsView* CreateWebContentsView() OVERRIDE { | 190 virtual WebContentsView* CreateWebContentsView() OVERRIDE { |
| 191 return NULL; | 191 return NULL; |
| 192 } | 192 } |
| 193 | 193 |
| 194 private: | 194 private: |
| 195 InterstitialState* state_; | 195 InterstitialState* state_; |
| 196 bool* deleted_; | 196 bool* deleted_; |
| 197 int command_received_count_; | 197 int command_received_count_; |
| (...skipping 1929 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2127 EXPECT_EQ(0UL, deep_tree->child_at(0)->child_at(0)->child_count()); | 2127 EXPECT_EQ(0UL, deep_tree->child_at(0)->child_at(0)->child_count()); |
| 2128 | 2128 |
| 2129 contents()->OnFrameDetached(16, 265); | 2129 contents()->OnFrameDetached(16, 265); |
| 2130 EXPECT_EQ(4UL, root->child_at(2)->child_count()); | 2130 EXPECT_EQ(4UL, root->child_at(2)->child_count()); |
| 2131 | 2131 |
| 2132 contents()->OnFrameDetached(5, 15); | 2132 contents()->OnFrameDetached(5, 15); |
| 2133 EXPECT_EQ(2UL, root->child_count()); | 2133 EXPECT_EQ(2UL, root->child_count()); |
| 2134 } | 2134 } |
| 2135 | 2135 |
| 2136 } // namespace content | 2136 } // namespace content |
| OLD | NEW |