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

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2652793003: Add login screen locale and input method device policies (Closed)
Patch Set: Rebase. Created 3 years, 10 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/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index e80cd4d85b3dbe8b856c0dc98b3b2da7037f3148..722d71a8d2a985bd783f28a3171dd6206149a191 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -478,6 +478,13 @@ void SystemTrayDelegateChromeOS::GetCurrentIMEProperties(
}
}
+base::string16 SystemTrayDelegateChromeOS::GetIMEManagedMessage() {
+ auto ime_state = input_method::InputMethodManager::Get()->GetActiveIMEState();
+ return ime_state->GetAllowedInputMethods().empty()
+ ? base::string16()
+ : l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY);
+}
+
void SystemTrayDelegateChromeOS::SwitchIME(const std::string& ime_id) {
input_method::InputMethodManager::Get()
->GetActiveIMEState()

Powered by Google App Engine
This is Rietveld 408576698