diff options
| author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 09:10:14 +0000 |
|---|---|---|
| committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 09:10:14 +0000 |
| commit | 4f5c4b89293b9cd686468e7e921df16aa80d891b (patch) | |
| tree | 9c32a2068eefaef9b1a3831dbad9656c79143171 /ash/test | |
| parent | 69bfd2e9ba568606ac4363e1772af826d59624d7 (diff) | |
| download | chromium_src-4f5c4b89293b9cd686468e7e921df16aa80d891b.zip chromium_src-4f5c4b89293b9cd686468e7e921df16aa80d891b.tar.gz chromium_src-4f5c4b89293b9cd686468e7e921df16aa80d891b.tar.bz2 | |
Revert 134878 - 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
TBR=rkc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10316004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134881 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, 0 insertions, 9 deletions
diff --git a/ash/test/DEPS b/ash/test/DEPS deleted file mode 100644 index 659b105..0000000 --- a/ash/test/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+content/test", -] diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index ad6f34a..f3dbea5 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -10,7 +10,6 @@ #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" @@ -60,10 +59,6 @@ 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 ce04845..1788a4a 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -29,7 +29,6 @@ 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; |