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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 471973002: Single pod autofocus disabled for touch view mode. Delegate class created for ash interactions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 0a2c84fdd45444a363c30f74f7a02da140f711e6..001034a5857f6af4031b1416cb6106dbdd55a815 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -298,6 +298,9 @@ SigninScreenHandler::SigninScreenHandler(
if (keyboard)
keyboard->AddObserver(this);
+ max_mode_delegate_.reset(new MaximizeModeControllerDelegate());
+ max_mode_delegate_->AddObserver(this);
+
policy::ConsumerManagementService* consumer_management =
g_browser_process->platform_part()->browser_policy_connector_chromeos()->
GetConsumerManagementService();
@@ -316,6 +319,8 @@ SigninScreenHandler::~SigninScreenHandler() {
if (delegate_)
delegate_->SetWebUIHandler(NULL);
network_state_informer_->RemoveObserver(this);
+ max_mode_delegate_->RemoveObserver(this);
+ max_mode_delegate_.reset(NULL);
ScreenlockBridge::Get()->SetLockHandler(NULL);
}
@@ -505,6 +510,9 @@ void SigninScreenHandler::UpdateUIState(UIState ui_state,
break;
case UI_STATE_ACCOUNT_PICKER:
ui_state_ = UI_STATE_ACCOUNT_PICKER;
+ params->SetBoolean(
+ "touchViewEnabled",
+ max_mode_delegate_->IsMaximizeModeEnabled());
ShowScreen(OobeUI::kScreenAccountPicker, params);
break;
default:
@@ -783,6 +791,8 @@ void SigninScreenHandler::RegisterPrefs(PrefRegistrySimple* registry) {
}
void SigninScreenHandler::HandleGetUsers() {
+ CallJS("login.AccountPickerScreen.setTouchViewState",
Nikita (slow) 2014/08/14 15:48:00 Not needed?
merkulova 2014/08/14 15:56:02 Done.
+ max_mode_delegate_->IsMaximizeModeEnabled());
if (delegate_)
delegate_->HandleGetUsers();
}
@@ -987,6 +997,14 @@ void SigninScreenHandler::Unlock(const std::string& user_email) {
ScreenLocker::Hide();
}
+void SigninScreenHandler::OnMaximizeModeStarted() {
+ CallJS("login.AccountPickerScreen.setTouchViewState", true);
+}
+
+void SigninScreenHandler::OnMaximizeModeEnded() {
+ CallJS("login.AccountPickerScreen.setTouchViewState", false);
+}
+
bool SigninScreenHandler::ShouldLoadGaia() const {
// Fetching of the extension is not started before account picker page is
// loaded because it can affect the loading speed.

Powered by Google App Engine
This is Rietveld 408576698