diff options
author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 21:54:04 +0000 |
---|---|---|
committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 21:54:04 +0000 |
commit | 669a2ef721ff2ba7fba0d5bf1f8357af5f722ff6 (patch) | |
tree | fa52cca867d3d600b074524b67dc0286d8041359 /content/test/test_render_view_host_factory.cc | |
parent | 75d86c040b469787676a7bb1f3650a4903bc13fb (diff) | |
download | chromium_src-669a2ef721ff2ba7fba0d5bf1f8357af5f722ff6.zip chromium_src-669a2ef721ff2ba7fba0d5bf1f8357af5f722ff6.tar.gz chromium_src-669a2ef721ff2ba7fba0d5bf1f8357af5f722ff6.tar.bz2 |
Re-implement the screensaver to use WebView instead of ExtensionDialogHost.
Use WebView to render the screensaver extension instead of ExtensionDialogHost. Using the RenderViewGone override to detect termination of the renderer process to restart it.
Added browser tests.
R=ben@chromium.org,sky@chromium.org
BUG=chromium-os:28211
TEST=Tested that the screensaver comes up; tested the reload via crashing the extension renderer with SIG_ABRT; also ran browser tests.
Review URL: https://chromiumcodereview.appspot.com/10191010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/test_render_view_host_factory.cc')
-rw-r--r-- | content/test/test_render_view_host_factory.cc | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/content/test/test_render_view_host_factory.cc b/content/test/test_render_view_host_factory.cc new file mode 100644 index 0000000..9173dcb --- /dev/null +++ b/content/test/test_render_view_host_factory.cc @@ -0,0 +1,40 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "content/test/test_render_view_host_factory.h" + +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/site_instance_impl.h" +#include "content/public/browser/render_process_host_factory.h" + +namespace content { + +TestRenderViewHostFactory::TestRenderViewHostFactory( + content::RenderProcessHostFactory* rph_factory) + : render_process_host_factory_(rph_factory) { + RenderViewHostFactory::RegisterFactory(this); +} + +TestRenderViewHostFactory::~TestRenderViewHostFactory() { + RenderViewHostFactory::UnregisterFactory(); +} + +void TestRenderViewHostFactory::set_render_process_host_factory( + content::RenderProcessHostFactory* rph_factory) { + render_process_host_factory_ = rph_factory; +} + +content::RenderViewHost* TestRenderViewHostFactory::CreateRenderViewHost( + SiteInstance* instance, + RenderViewHostDelegate* delegate, + int routing_id, + bool swapped_out, + SessionStorageNamespace* session_storage) { + // See declaration of render_process_host_factory_ below. + static_cast<SiteInstanceImpl*>(instance)-> + set_render_process_host_factory(render_process_host_factory_); + return new TestRenderViewHost(instance, delegate, routing_id, swapped_out); +} + +} // namespace content |