Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / helper.cc

diff --git a/src/chrome/browser/chromeos/login/helper.cc b/src/chrome/browser/chromeos/login/helper.cc
index 45aafe1..3735153 100644 (file)
--- a/src/chrome/browser/chromeos/login/helper.cc
+++ b/src/chrome/browser/chromeos/login/helper.cc
@@ -8,7 +8,6 @@
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/grit/generated_resources.h"
-#include "chrome/grit/theme_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
@@ -43,8 +42,15 @@ int GetCurrentUserImageSize() {
 namespace login {
 
 bool LoginScrollIntoViewEnabled() {
+#if defined(USE_ATHENA)
+  // TODO(nkostylev): temporary always enable overscroll mode for Athena,
+  // later we will need special API in Blink to specify which element need to
+  // be centered when virtual keyboard shown, crbug.com/411879
+  return false;
+#else
   return !CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kDisableLoginScrollIntoView);
+#endif
 }
 
 NetworkStateHelper::NetworkStateHelper() {}