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

Unified Diff: ash/shell/shell_delegate_impl.h

Issue 508813002: Move ownership of the AppListViewDelegate into the AppListService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix comments 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
« no previous file with comments | « no previous file | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/shell_delegate_impl.h
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index ede68200e78134e74cbbb0c8044d17a08a807514..a99532823c05e714377c276e5164734afa2741fa 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -50,7 +50,7 @@ class ShellDelegateImpl : public ash::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 ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
@@ -71,6 +71,7 @@ class ShellDelegateImpl : public ash::ShellDelegate {
ShelfDelegateImpl* shelf_delegate_;
content::BrowserContext* browser_context_;
+ scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
};
« no previous file with comments | « no previous file | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698