diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 04:11:45 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 04:11:45 +0000 |
| commit | 0039db9b4f365a4c6b1bbd72b4ca4e2aeb65c354 (patch) | |
| tree | 5a50f8caa29ce4038da05b20f18161887c3c8fc3 /ash/test | |
| parent | eb951d02de207130faca3a648d481108c97a8525 (diff) | |
| download | chromium_src-0039db9b4f365a4c6b1bbd72b4ca4e2aeb65c354.zip chromium_src-0039db9b4f365a4c6b1bbd72b4ca4e2aeb65c354.tar.gz chromium_src-0039db9b4f365a4c6b1bbd72b4ca4e2aeb65c354.tar.bz2 | |
Move app list from ash to ui.
The goal is to make app list an independent component so that it could be reused in elsewhere.
BUG=none.
TEST=none.
Review URL: https://chromiumcodereview.appspot.com/10388032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 2 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index 0dcd167..56f208b 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -67,7 +67,7 @@ content::BrowserContext* TestShellDelegate::GetCurrentBrowserContext() { void TestShellDelegate::ToggleSpokenFeedback() { } -AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() { +app_list::AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() { return NULL; } diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index 1c13794..d59972d 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -31,7 +31,7 @@ class TestShellDelegate : public ShellDelegate { virtual void OpenMobileSetup() OVERRIDE; virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE; virtual void ToggleSpokenFeedback() OVERRIDE; - virtual AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; + virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; virtual void StartPartialScreenshot( ScreenshotDelegate* screenshot_delegate) OVERRIDE; virtual LauncherDelegate* CreateLauncherDelegate( |