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

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: Cleanup variable names Created 3 years, 11 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..b9bbb59fc50ad50943c3e87ea8d658414cf4fd82 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -478,6 +478,17 @@ void SystemTrayDelegateChromeOS::GetCurrentIMEProperties(
}
}
+base::string16 SystemTrayDelegateChromeOS::GetIMEManagedMessage() {
+ input_method::InputMethodManager* manager =
+ input_method::InputMethodManager::Get();
+ if (manager->GetActiveIMEState()
+ ->GetAllowedKeyboardLayoutInputMethods()
+ .empty())
+ return base::string16();
+ else
+ return l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY);
Peter Kasting 2017/01/25 22:09:30 Nit: Shorter, and avoids else after return: aut
pmarko 2017/01/26 12:32:58 Thanks, done.
+}
+
void SystemTrayDelegateChromeOS::SwitchIME(const std::string& ime_id) {
input_method::InputMethodManager::Get()
->GetActiveIMEState()

Powered by Google App Engine
This is Rietveld 408576698