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..46902981e6b0e1581e439e7c5baad363065ec457 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 = "mlogin"; |
Nikita (slow)
2014/07/25 14:28:57
nit: secondary-login?
Shu Chen
2014/07/25 14:30:58
Done.
|
} |
if (!screen_type.empty()) |
val->SetStringWithoutPathExpansion("screen", screen_type); |