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

Unified Diff: chromeos/settings/timezone_settings.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: chromeos/settings/timezone_settings.cc
diff --git a/chromeos/settings/timezone_settings.cc b/chromeos/settings/timezone_settings.cc
index 38ea65d653ac09e82014bf3bf3d3cd1542203c55..33f0b544527b43fcda53cd83cde5a7ff69053d03 100644
--- a/chromeos/settings/timezone_settings.cc
+++ b/chromeos/settings/timezone_settings.cc
@@ -468,7 +468,7 @@ TimezoneSettings::Observer::~Observer() {}
// static
TimezoneSettings* TimezoneSettings::GetInstance() {
- if (base::SysInfo::IsRunningOnChromeOS()) {
+ if (base::SysInfo::IsRunningAsSystemCompositor()) {
rjkroege 2017/01/02 01:26:27 Are you sure that you should have changed this one
reveman 2017/01/02 07:11:32 hm, maybe the stub impl works better on non-chrome
return TimezoneSettingsImpl::GetInstance();
} else {
return TimezoneSettingsStubImpl::GetInstance();

Powered by Google App Engine
This is Rietveld 408576698