diff options
| author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 10:42:47 +0000 |
|---|---|---|
| committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 10:42:47 +0000 |
| commit | 193559b81078baed256db62d9c53df1ea1e00c54 (patch) | |
| tree | 61f6a3a9b78e86cb18c7fda00e25372603876585 /ash/shell/shell_delegate_impl.cc | |
| parent | 01ea752739447788d28824cc40f40215e7a527b3 (diff) | |
| download | chromium_src-193559b81078baed256db62d9c53df1ea1e00c54.zip chromium_src-193559b81078baed256db62d9c53df1ea1e00c54.tar.gz chromium_src-193559b81078baed256db62d9c53df1ea1e00c54.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: http://codereview.chromium.org/10191010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/shell_delegate_impl.cc')
| -rw-r--r-- | ash/shell/shell_delegate_impl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index c2bfdc0..4805957 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -75,6 +75,10 @@ void ShellDelegateImpl::OpenCrosh() { void ShellDelegateImpl::OpenMobileSetup() { } +content::BrowserContext* ShellDelegateImpl::GetCurrentBrowserContext() { + return Shell::GetInstance()->browser_context(); +} + ash::AppListViewDelegate* ShellDelegateImpl::CreateAppListViewDelegate() { return ash::shell::CreateAppListViewDelegate(); } |