Use same vk non-overscroll solution for both login and lock screens

chrome/browser/chromeos/login/lock/webui_screen_locker.cc

 // Copyright 2014 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/chromeos/login/lock/webui_screen_locker.h"
 
 #include "ash/shell.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/lock_state_observer.h"
 #include "base/command_line.h"
@@ skipping 88 matching lines @@
   login_display_->set_parent_window(GetNativeWindow());
   login_display_->Init(screen_locker()->users(), false, true, false);
 
   GetOobeUI()->ShowSigninScreen(
       LoginScreenContext(), login_display_.get(), login_display_.get());
 
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                  content::NotificationService::AllSources());
 
-  if (login::LockScrollIntoViewEnabled())
+  if (login::LoginScrollIntoViewEnabled())
     DisableKeyboardOverscroll();
 }
 
 void WebUIScreenLocker::ScreenLockReady() {
   UMA_HISTOGRAM_TIMES("LockScreen.LockReady",
                       base::TimeTicks::Now() - lock_time_);
   ScreenLockerDelegate::ScreenLockReady();
   SetInputEnabled(true);
 }
 
@@ skipping 52 matching lines @@
   }
 
   if (keyboard::KeyboardController::GetInstance() && is_observing_keyboard_) {
     keyboard::KeyboardController::GetInstance()->RemoveObserver(this);
     is_observing_keyboard_ = false;
   }
 
   ash::Shell::GetInstance()->delegate()->
       RemoveVirtualKeyboardStateObserver(this);
 
-  if (login::LockScrollIntoViewEnabled())
+  if (login::LoginScrollIntoViewEnabled())
     ResetKeyboardOverscrollOverride();
 }
 
 void WebUIScreenLocker::OnLockWebUIReady() {
   VLOG(1) << "WebUI ready; lock window is "
           << (lock_ready_ ? "too" : "not");
   webui_ready_ = true;
   if (lock_ready_)
     ScreenLockReady();
 }
@@ skipping 188 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // keyboard::KeyboardControllerObserver overrides.
 
 void WebUIScreenLocker::OnKeyboardBoundsChanging(
     const gfx::Rect& new_bounds) {
   if (new_bounds.IsEmpty() && !keyboard_bounds_.IsEmpty()) {
     // Keyboard has been hidden.
     if (GetOobeUI()) {
       GetOobeUI()->GetCoreOobeActor()->ShowControlBar(true);
-      if (login::LockScrollIntoViewEnabled())
+      if (login::LoginScrollIntoViewEnabled())
         GetOobeUI()->GetCoreOobeActor()->SetKeyboardState(false, new_bounds);
     }
   } else if (!new_bounds.IsEmpty() && keyboard_bounds_.IsEmpty()) {
     // Keyboard has been shown.
     if (GetOobeUI()) {
       GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false);
-      if (login::LockScrollIntoViewEnabled())
+      if (login::LoginScrollIntoViewEnabled())
         GetOobeUI()->GetCoreOobeActor()->SetKeyboardState(true, new_bounds);
     }
   }
 
   keyboard_bounds_ = new_bounds;
 }
 
 }  // namespace chromeos