Index: chrome/browser/ui/ash/chrome_shell_delegate.h |
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h |
index 0bff55ab29ffa45749431f012591d072c3f3ece5..564d24c6b682fd2302b6b38d9645a8c1b4852ecc 100644 |
--- a/chrome/browser/ui/ash/chrome_shell_delegate.h |
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h |
@@ -42,7 +42,8 @@ class ChromeShellDelegate : public ash::ShellDelegate, |
void Exit() override; |
keyboard::KeyboardUI* CreateKeyboardUI() override; |
void OpenUrlFromArc(const GURL& url) override; |
- ash::ShelfDelegate* CreateShelfDelegate(ash::ShelfModel* model) override; |
+ void ShelfInit() override; |
+ void ShelfShutdown() override; |
ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; |
std::unique_ptr<ash::WallpaperDelegate> CreateWallpaperDelegate() override; |
ash::SessionStateDelegate* CreateSessionStateDelegate() override; |
@@ -70,7 +71,7 @@ class ChromeShellDelegate : public ash::ShellDelegate, |
content::NotificationRegistrar registrar_; |
- ChromeLauncherControllerImpl* shelf_delegate_; |
+ std::unique_ptr<ChromeLauncherControllerImpl> launcher_controller_; |
std::unique_ptr<chromeos::DisplayConfigurationObserver> |
display_configuration_observer_; |