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 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ | 5 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ |
6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ | 6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 int proxy_route_id, | 230 int proxy_route_id, |
231 int32_t max_page_id, | 231 int32_t max_page_id, |
232 bool window_was_created_with_opener) override; | 232 bool window_was_created_with_opener) override; |
233 | 233 |
234 // RenderViewHost overrides -------------------------------------------------- | 234 // RenderViewHost overrides -------------------------------------------------- |
235 | 235 |
236 bool CreateRenderView(int opener_frame_route_id, | 236 bool CreateRenderView(int opener_frame_route_id, |
237 int proxy_route_id, | 237 int proxy_route_id, |
238 int32_t max_page_id, | 238 int32_t max_page_id, |
239 const FrameReplicationState& replicated_frame_state, | 239 const FrameReplicationState& replicated_frame_state, |
240 bool window_was_created_with_opener) override; | 240 bool window_was_created_with_opener, |
| 241 double zoom_level) override; |
241 | 242 |
242 private: | 243 private: |
243 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate); | 244 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate); |
244 | 245 |
245 void SendNavigateWithTransitionAndResponseCode(int page_id, | 246 void SendNavigateWithTransitionAndResponseCode(int page_id, |
246 const GURL& url, | 247 const GURL& url, |
247 ui::PageTransition transition, | 248 ui::PageTransition transition, |
248 int response_code); | 249 int response_code); |
249 | 250 |
250 // Calls OnNavigate on the RenderViewHost with the given information. | 251 // Calls OnNavigate on the RenderViewHost with the given information. |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
313 private: | 314 private: |
314 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> | 315 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> |
315 ScopedSetSupportedScaleFactors; | 316 ScopedSetSupportedScaleFactors; |
316 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; | 317 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; |
317 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); | 318 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); |
318 }; | 319 }; |
319 | 320 |
320 } // namespace content | 321 } // namespace content |
321 | 322 |
322 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ | 323 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ |
OLD | NEW |