Index: chrome/browser/ui/ash/chrome_shell_delegate.cc |
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc |
index 3d47b36766ba9413f1314c52c1b1f76893f04744..38117659e42ba41a03397f5cddd45274ef7a1a8d 100644 |
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc |
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc |
@@ -101,9 +101,13 @@ content::BrowserContext* ChromeShellDelegate::GetActiveBrowserContext() { |
} |
app_list::AppListViewDelegate* ChromeShellDelegate::GetAppListViewDelegate() { |
Jun Mukai
2014/10/09 23:34:53
Who invokes this?
pkotwicz
2014/10/10 00:51:31
This is to ensure that chrome still compiles. I ex
Jun Mukai
2014/10/10 01:01:08
Theoretically ChromeShellDelegate is only called f
pkotwicz
2014/10/10 01:32:32
The problem is that Athena still compiles Ash. I h
Jun Mukai
2014/10/10 01:41:20
Chatted with oshima offline and he suggested to ex
|
+#if defined(USE_ATHENA) |
+ return NULL; |
+#else |
DCHECK(ash::Shell::HasInstance()); |
return AppListServiceAsh::GetInstance()->GetViewDelegate( |
Profile::FromBrowserContext(GetActiveBrowserContext())); |
+#endif |
} |
ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate( |