Display dialog when app install succeeds / fails on Athena

chrome/browser/ui/ash/chrome_shell_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
 #include "ash/content_support/gpu_support_impl.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
@@ skipping 82 matching lines @@
   chrome::AttemptUserExit();
 }
 
 content::BrowserContext* ChromeShellDelegate::GetActiveBrowserContext() {
 #if defined(OS_CHROMEOS)
   DCHECK(user_manager::UserManager::Get()->GetLoggedInUsers().size());
 #endif
   return ProfileManager::GetActiveUserProfile();
 }
 
 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 exclude AppListServiceAsh from
chrome Athena

[Jun Mukai, 2014/10/10 01:01:08]

Theoretically ChromeShellDelegate is only called from ash to bring chrome
features. This means in Athena this method should not be called.

So I think it's okay to leave as is, and if it crashes, fix the caller, not
here.

[pkotwicz, 2014/10/10 01:32:32]

The problem is that Athena still compiles Ash. I have volunteered to make Chrome
using Athena not compile Ash. This CL should not be blocked on that refactor
though

[Jun Mukai, 2014/10/10 01:41:20]

Chatted with oshima offline and he suggested to exclude this file itself (and
ash_init) from athena-on-chrome build, they are actually not used in Athena.

If we can now simply exclude those files, I think it's a better way to go. If it
needs additional hack, then, this CL is fine.

+#if defined(USE_ATHENA)
+  return NULL;
+#else
   DCHECK(ash::Shell::HasInstance());
   return AppListServiceAsh::GetInstance()->GetViewDelegate(
       Profile::FromBrowserContext(GetActiveBrowserContext()));
+#endif
 }
 
 ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(
     ash::ShelfModel* model) {
   if (!shelf_delegate_) {
     shelf_delegate_ = ChromeLauncherController::CreateInstance(NULL, model);
     shelf_delegate_->Init();
   }
   return shelf_delegate_;
 }
@@ skipping 35 matching lines @@
 
 void ChromeShellDelegate::AddVirtualKeyboardStateObserver(
     ash::VirtualKeyboardStateObserver* observer) {
   keyboard_state_observer_list_.AddObserver(observer);
 }
 
 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver(
     ash::VirtualKeyboardStateObserver* observer) {
   keyboard_state_observer_list_.RemoveObserver(observer);
 }