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

Unified Diff: chrome/browser/extensions/api/input_ime/input_ime_api.cc

Issue 417183002: Support 'mlogin' screen type for multi-profile login to onFocus event to IME extensions. This is th… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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/extensions/api/input_ime/input_ime_api.cc
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc
index dcd6ba4689de31ef4587e4a9eb670f65912ffee0..b1d15c6cec63e6c77ccdf3b66a7cb0bf0111abae 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc
@@ -7,6 +7,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "chrome/browser/chromeos/login/lock/screen_locker.h"
+#include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -155,8 +156,10 @@ class ImeObserver : public InputMethodEngineInterface::Observer {
if (!UserManager::Get()->IsUserLoggedIn()) {
screen_type = "login";
} else if (chromeos::ScreenLocker::default_screen_locker() &&
- chromeos::ScreenLocker::default_screen_locker()->locked()) {
+ chromeos::ScreenLocker::default_screen_locker()->locked()) {
screen_type = "lock";
+ } else if (UserAddingScreen::Get()->IsRunning()) {
+ screen_type = "secondary-login";
}
if (!screen_type.empty())
val->SetStringWithoutPathExpansion("screen", screen_type);
« 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