Minimal support for OOBE/login for chrome-athena

chrome/browser/chromeos/login/ui/webui_login_display.cc

Index: chrome/browser/chromeos/login/ui/webui_login_display.cc
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.cc b/chrome/browser/chromeos/login/ui/webui_login_display.cc
index 1655f7cd8b240ff8c46c14b9e8f2b955fa4571de..cd69a7519d24287ce8357bbd10ed36c0f0137dcf 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.cc
@@ -32,10 +32,12 @@ namespace chromeos {
 WebUILoginDisplay::~WebUILoginDisplay() {
   if (webui_handler_)
     webui_handler_->ResetSigninScreenHandlerDelegate();
-  wm::UserActivityDetector* activity_detector = ash::Shell::GetInstance()->
+  if (ash::Shell::HasInstance()) {
+    wm::UserActivityDetector* activity_detector = ash::Shell::GetInstance()->
       user_activity_detector();
-  if (activity_detector->HasObserver(this))
-    activity_detector->RemoveObserver(this);
+    if (activity_detector->HasObserver(this))
+      activity_detector->RemoveObserver(this);
+  }
 }
 
 // LoginDisplay implementation: ------------------------------------------------
@@ -66,10 +68,12 @@ void WebUILoginDisplay::Init(const user_manager::UserList& users,
   show_users_ = show_users;
   show_new_user_ = show_new_user;
 
-  wm::UserActivityDetector* activity_detector = ash::Shell::GetInstance()->
-      user_activity_detector();
-  if (!activity_detector->HasObserver(this))
-    activity_detector->AddObserver(this);
+  if (ash::Shell::HasInstance()) {
+    wm::UserActivityDetector* activity_detector = ash::Shell::GetInstance()->
+        user_activity_detector();
+    if (!activity_detector->HasObserver(this))
+      activity_detector->AddObserver(this);
+  }
 }
 
 // ---- Common methods