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

Unified Diff: chrome/browser/chromeos/input_method/input_method_manager_impl.cc

Issue 2585633004: ozone: Allow ozone evdev/kvm features to be enabled without running on ChromeOS. (Closed)
Patch Set: fix bad rebase Created 4 years 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/chromeos/input_method/input_method_manager_impl.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
index db90c650dee9c0f54c6248a54a2df3896327268d..61c4dcca960fd5b2d8056f066e57bd05ca8a6286 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -861,10 +861,12 @@ InputMethodManagerImpl::InputMethodManagerImpl(
is_ime_menu_activated_(false) {
// TODO(mohsen): Revisit using FakeImeKeyboard with mash when InputController
// work is ready. http://crbug.com/601981
- if (base::SysInfo::IsRunningOnChromeOS() && !chrome::IsRunningInMash())
+ if (base::SysInfo::IsRunningAsSystemCompositor() &&
+ !chrome::IsRunningInMash()) {
keyboard_.reset(ImeKeyboard::Create());
- else
+ } else {
keyboard_.reset(new FakeImeKeyboard());
+ }
// Initializes the system IME list.
std::unique_ptr<ComponentExtensionIMEManagerDelegate> comp_delegate(

Powered by Google App Engine
This is Rietveld 408576698