Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8097)

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 301163002: Revert of Revert of Follow up change for disabling out-of-box VK overscroll (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index 5eb3f15c0190662fe101affc423f4ba50aca083f..7ddb6353ccc34a8ddc63eb62e89791353259fb7d 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -39,6 +39,7 @@
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/login_utils.h"
#include "chrome/browser/chromeos/login/login_wizard.h"
+#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
#include "chrome/browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h"
@@ -906,17 +907,17 @@
const gfx::Rect& new_bounds) {
if (new_bounds.IsEmpty() && !keyboard_bounds_.IsEmpty()) {
// Keyboard has been hidden.
- if (webui_login_display_) {
- webui_login_display_->ShowControlBar(true);
+ if (GetOobeUI()) {
+ GetOobeUI()->GetCoreOobeActor()->ShowControlBar(true);
if (login::LoginScrollIntoViewEnabled())
- webui_login_display_->SetKeyboardState(false);
+ GetOobeUI()->GetCoreOobeActor()->SetKeyboardState(false);
}
} else if (!new_bounds.IsEmpty() && keyboard_bounds_.IsEmpty()) {
// Keyboard has been shown.
- if (webui_login_display_) {
- webui_login_display_->ShowControlBar(false);
+ if (GetOobeUI()) {
+ GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false);
if (login::LoginScrollIntoViewEnabled())
- webui_login_display_->SetKeyboardState(true);
+ GetOobeUI()->GetCoreOobeActor()->SetKeyboardState(true);
}
}
@@ -939,9 +940,10 @@
return;
}
- if (webui_login_display_) {
+ if (GetOobeUI()) {
const gfx::Size& size = ash::Shell::GetScreen()->GetPrimaryDisplay().size();
- webui_login_display_->SetClientAreaSize(size.width(), size.height());
+ GetOobeUI()->GetCoreOobeActor()->SetClientAreaSize(size.width(),
+ size.height());
}
}
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display.h ('k') | chrome/browser/chromeos/login/ui/mock_login_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698