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

Unified Diff: chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc

Issue 2585633004: ozone: Allow ozone evdev/kvm features to be enabled without running on ChromeOS. (Closed)
Patch Set: rebase 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
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chromeos/chromeos.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
diff --git a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
index 7505514aba45eedb2ea595a340d7877c14d56c50..412b7420c5b94153dd434ee9f50e1fb1ea216cbe 100644
--- a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
+++ b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/chromeos/system/input_device_settings.h"
#include "base/macros.h"
-#include "base/sys_info.h"
#include "chrome/browser/chromeos/system/fake_input_device_settings.h"
+#include "chromeos/system/devicemode.h"
#include "content/public/browser/browser_thread.h"
#include "services/service_manager/runner/common/client_util.h"
#include "ui/ozone/public/input_controller.h"
@@ -165,7 +165,7 @@ void InputDeviceSettingsImplOzone::SetTouchscreensEnabled(bool enabled) {
// static
InputDeviceSettings* InputDeviceSettings::Get() {
if (!g_instance) {
- if (base::SysInfo::IsRunningOnChromeOS())
+ if (IsRunningAsSystemCompositor())
g_instance = new InputDeviceSettingsImplOzone;
else
g_instance = new FakeInputDeviceSettings();
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chromeos/chromeos.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698