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

Unified Diff: chrome/browser/chromeos/dbus/cros_dbus_service.cc

Issue 23904025: Move IsRunningOnChromeOS to SysInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge fix Created 7 years, 3 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/chromeos/dbus/cros_dbus_service.cc
diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service.cc b/chrome/browser/chromeos/dbus/cros_dbus_service.cc
index aefccdb9b43a958b72cdd3adce9bd791e6a90c76..76be30b4f1a16f60f14795b823ce763e81d4ff91 100644
--- a/chrome/browser/chromeos/dbus/cros_dbus_service.cc
+++ b/chrome/browser/chromeos/dbus/cros_dbus_service.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
#include "base/bind.h"
-#include "base/chromeos/chromeos_version.h"
#include "base/stl_util.h"
+#include "base/sys_info.h"
#include "base/threading/platform_thread.h"
#include "chrome/browser/chromeos/dbus/display_power_service_provider.h"
#include "chrome/browser/chromeos/dbus/liveness_service_provider.h"
@@ -118,7 +118,7 @@ void CrosDBusService::Initialize() {
return;
}
dbus::Bus* bus = DBusThreadManager::Get()->GetSystemBus();
- if (base::chromeos::IsRunningOnChromeOS() && bus) {
+ if (base::SysInfo::IsRunningOnChromeOS() && bus) {
CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus);
service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create());
service->RegisterServiceProvider(new DisplayPowerServiceProvider);

Powered by Google App Engine
This is Rietveld 408576698