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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1929733002: Login Screen for Mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 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
« chrome/browser/chromeos/login/session/user_session_manager.cc ('K') | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 185e94d87d64cfaae3edaabdbb16bbd9429bf9b0..5b36afaae44a3de3a68c4b692b6a810894981f32 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -53,6 +53,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_metrics.h"
#include "chrome/browser/signin/easy_unlock_service.h"
+#include "chrome/browser/ui/ash/ash_util.h"
#include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
@@ -272,8 +273,10 @@ SigninScreenHandler::SigninScreenHandler(
if (keyboard)
keyboard->AddObserver(this);
- max_mode_delegate_.reset(new TouchViewControllerDelegate());
- max_mode_delegate_->AddObserver(this);
+ if (!chrome::IsRunningInMash()) {
+ max_mode_delegate_.reset(new TouchViewControllerDelegate());
+ max_mode_delegate_->AddObserver(this);
+ }
}
SigninScreenHandler::~SigninScreenHandler() {
« chrome/browser/chromeos/login/session/user_session_manager.cc ('K') | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698