Make login code not depend on Ash when use_athena=1

chrome/browser/chromeos/login/helper.cc

Index: chrome/browser/chromeos/login/helper.cc
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index 3735153b9b34ec5628b3fe1583518647c7005e82..9378f0e33fb55c0480c50ff4a5ed387193d9c122 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/chromeos/login/helper.h"
 
-#include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/grit/generated_resources.h"
@@ -17,9 +16,16 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 
+#if !defined(USE_ATHENA)
+#include "ash/shell.h"
+#endif
+
 namespace chromeos {
 
 gfx::Rect CalculateScreenBounds(const gfx::Size& size) {
+#if defined(USE_ATHENA)
+  return gfx::Rect();
+#else
   gfx::Rect bounds(ash::Shell::GetScreen()->GetPrimaryDisplay().bounds());

[oshima, 2014/10/30 18:11:42]

use gfx::Screen instead

   if (!size.IsEmpty()) {
     int horizontal_diff = bounds.width() - size.width();
@@ -27,6 +33,7 @@ gfx::Rect CalculateScreenBounds(const gfx::Size& size) {
     bounds.Inset(horizontal_diff / 2, vertical_diff / 2);
   }
   return bounds;
+#endif
 }
 
 int GetCurrentUserImageSize() {