diff options
| author | caseq@google.com <caseq@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 12:04:16 +0000 |
|---|---|---|
| committer | caseq@google.com <caseq@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 12:04:16 +0000 |
| commit | 5defceece89b1953c722c479b8b0505045e01733 (patch) | |
| tree | 7dd4144cced43dc34fc3c30af459c5fe60f89a0a /ash/test | |
| parent | ed7bbb53170c3d54dfbd393c79fae6539fbab358 (diff) | |
| download | chromium_src-5defceece89b1953c722c479b8b0505045e01733.zip chromium_src-5defceece89b1953c722c479b8b0505045e01733.tar.gz chromium_src-5defceece89b1953c722c479b8b0505045e01733.tar.bz2 | |
Revert r134889, "Re-implement the screensaver to use WebView instead of ExtensionDialogHost."
The original change broke Win Aura and 3 Linux CrOs builders.
TBR=rkc@chromium.org,finnur@chromium.org
BUG=chromium-os:28211
TEST=tree goes green
Review URL: https://chromiumcodereview.appspot.com/10314008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134893 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; |