Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(517)

Unified Diff: ash/test/test_shell_delegate.h

Issue 508813002: Move ownership of the AppListViewDelegate into the AppListService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase to master Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/test/test_shell_delegate.h
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 01416170044a9a0a6a170ef2de356adb6f35deb8..4cb369d34727445267797be7b5f6e653dd6bbc55 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -48,7 +48,7 @@ class TestShellDelegate : public ShellDelegate {
virtual void RemoveVirtualKeyboardStateObserver(
VirtualKeyboardStateObserver* observer) OVERRIDE;
virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE;
- virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
+ virtual app_list::AppListViewDelegate* GetAppListViewDelegate() OVERRIDE;
virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE;
virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
@@ -76,6 +76,7 @@ class TestShellDelegate : public ShellDelegate {
bool multi_profiles_enabled_;
scoped_ptr<content::BrowserContext> active_browser_context_;
+ scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_;

Powered by Google App Engine
This is Rietveld 408576698