diff options
| author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 08:54:20 +0000 |
|---|---|---|
| committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 08:54:20 +0000 |
| commit | d35162497672a6c2d66429e94b7341bc73d3620c (patch) | |
| tree | ca73bc4c1b92913ecb438f3dd3351f97b2b4da60 /ash/test | |
| parent | e2641d881d24be43d5ddaa4ea72a23fb9cf41df0 (diff) | |
| download | chromium_src-d35162497672a6c2d66429e94b7341bc73d3620c.zip chromium_src-d35162497672a6c2d66429e94b7341bc73d3620c.tar.gz chromium_src-d35162497672a6c2d66429e94b7341bc73d3620c.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@134878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/DEPS | 3 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 5 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.h | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/ash/test/DEPS b/ash/test/DEPS new file mode 100644 index 0000000..659b105 --- /dev/null +++ b/ash/test/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+content/test", +] diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index f3dbea5..ad6f34a 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -10,6 +10,7 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/test/test_launcher_delegate.h" +#include "content/test/test_browser_context.h" #include "grit/ui_resources.h" #include "ui/aura/window.h" @@ -59,6 +60,10 @@ void TestShellDelegate::OpenCrosh() { void TestShellDelegate::OpenMobileSetup() { } +content::BrowserContext* TestShellDelegate::GetCurrentBrowserContext() { + return new TestBrowserContext(); +} + AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() { return NULL; } diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index 1788a4a..ce04845 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -29,6 +29,7 @@ class TestShellDelegate : public ShellDelegate { virtual void OpenFileManager() OVERRIDE; virtual void OpenCrosh() OVERRIDE; virtual void OpenMobileSetup() OVERRIDE; + virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE; virtual AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; virtual void StartPartialScreenshot( ScreenshotDelegate* screenshot_delegate) OVERRIDE; |