Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Side by Side Diff: trunk/src/content/browser/renderer_host/test_render_view_host.cc

Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/renderer_host/test_render_view_host.h" 5 #include "content/browser/renderer_host/test_render_view_host.h"
6 6
7 #include "base/memory/scoped_ptr.h"
8 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" 7 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
9 #include "content/browser/dom_storage/session_storage_namespace_impl.h" 8 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
10 #include "content/browser/renderer_host/test_backing_store.h" 9 #include "content/browser/renderer_host/test_backing_store.h"
11 #include "content/browser/site_instance_impl.h" 10 #include "content/browser/site_instance_impl.h"
12 #include "content/common/dom_storage/dom_storage_types.h" 11 #include "content/common/dom_storage/dom_storage_types.h"
13 #include "content/common/view_messages.h" 12 #include "content/common/view_messages.h"
14 #include "content/public/browser/browser_context.h" 13 #include "content/public/browser/browser_context.h"
15 #include "content/public/browser/navigation_controller.h" 14 #include "content/public/browser/navigation_controller.h"
16 #include "content/public/browser/storage_partition.h" 15 #include "content/public/browser/storage_partition.h"
17 #include "content/public/common/content_client.h" 16 #include "content/public/common/content_client.h"
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 387
389 void TestRenderViewHost::set_simulate_fetch_via_proxy(bool proxy) { 388 void TestRenderViewHost::set_simulate_fetch_via_proxy(bool proxy) {
390 simulate_fetch_via_proxy_ = proxy; 389 simulate_fetch_via_proxy_ = proxy;
391 } 390 }
392 391
393 void TestRenderViewHost::set_simulate_history_list_was_cleared(bool cleared) { 392 void TestRenderViewHost::set_simulate_history_list_was_cleared(bool cleared) {
394 simulate_history_list_was_cleared_ = cleared; 393 simulate_history_list_was_cleared_ = cleared;
395 } 394 }
396 395
397 RenderViewHostImplTestHarness::RenderViewHostImplTestHarness() { 396 RenderViewHostImplTestHarness::RenderViewHostImplTestHarness() {
398 std::vector<ui::ScaleFactor> scale_factors;
399 scale_factors.push_back(ui::SCALE_FACTOR_100P);
400 scoped_set_supported_scale_factors_.reset(
401 new ui::test::ScopedSetSupportedScaleFactors(scale_factors));
402 } 397 }
403 398
404 RenderViewHostImplTestHarness::~RenderViewHostImplTestHarness() { 399 RenderViewHostImplTestHarness::~RenderViewHostImplTestHarness() {
405 } 400 }
406 401
407 TestRenderViewHost* RenderViewHostImplTestHarness::test_rvh() { 402 TestRenderViewHost* RenderViewHostImplTestHarness::test_rvh() {
408 return static_cast<TestRenderViewHost*>(rvh()); 403 return static_cast<TestRenderViewHost*>(rvh());
409 } 404 }
410 405
411 TestRenderViewHost* RenderViewHostImplTestHarness::pending_test_rvh() { 406 TestRenderViewHost* RenderViewHostImplTestHarness::pending_test_rvh() {
412 return static_cast<TestRenderViewHost*>(pending_rvh()); 407 return static_cast<TestRenderViewHost*>(pending_rvh());
413 } 408 }
414 409
415 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() { 410 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() {
416 return static_cast<TestRenderViewHost*>(active_rvh()); 411 return static_cast<TestRenderViewHost*>(active_rvh());
417 } 412 }
418 413
419 TestWebContents* RenderViewHostImplTestHarness::contents() { 414 TestWebContents* RenderViewHostImplTestHarness::contents() {
420 return static_cast<TestWebContents*>(web_contents()); 415 return static_cast<TestWebContents*>(web_contents());
421 } 416 }
422 417
423 } // namespace content 418 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698