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

Unified Diff: chrome/browser/chromeos/login/lock/webui_screen_locker.cc

Issue 2736813002: mash: Fix screen lock preload crash after login (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/lock/webui_screen_locker.cc
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
index 659e0f45c4c65f9d38d843ead6cc2dc73022d588..f9ad40de117466886e5c58a29443caf172ffe805 100644
--- a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
+++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/chromeos/login/ui/preloaded_web_view_factory.h"
#include "chrome/browser/chromeos/login/ui/webui_login_display.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/ui/ash/ash_util.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
#include "chrome/common/chrome_features.h"
@@ -81,6 +82,12 @@ void WebUIScreenLocker::RequestPreload() {
// static
bool WebUIScreenLocker::ShouldPreloadLockScreen() {
+ // Bail for mash because IdleDetector/UserActivityDetector does not work
+ // properly there.
+ // TODO(xiyuan): Revisit after http://crbug.com/626899.
+ if (ash_util::IsRunningInMash())
Daniel Erat 2017/03/06 23:48:58 the connection between this code and IdleDetector
xiyuan 2017/03/06 23:54:50 Your reading is correct. This is an optimization t
Daniel Erat 2017/03/07 01:27:16 thanks for the explanation! would you mind also fi
xiyuan 2017/03/07 17:00:07 SG. Filed http://crbug.com/699144 to restore the r
+ return false;
+
Profile* profile = ProfileHelper::Get()->GetProfileByUser(
user_manager::UserManager::Get()->GetActiveUser());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698