chrome/browser/chromeos/dbus/bluetooth_manager_client.cc - Issue 9546013: Move IsRunningOnChromeOS to base/chromeos

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 9546013: Move IsRunningOnChromeOS to base/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chromeos_version,sync,cleanup Created 8 years, 9 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:

Index: chrome/browser/chromeos/dbus/bluetooth_manager_client.cc

diff --git a/chrome/browser/chromeos/dbus/bluetooth_manager_client.cc b/chrome/browser/chromeos/dbus/bluetooth_manager_client.cc

index 76142c834cc7b1e16f5e942e7705f715c0c4f177..7386c795583841a6f152aeb5536acddad0935049 100644

--- a/chrome/browser/chromeos/dbus/bluetooth_manager_client.cc

+++ b/chrome/browser/chromeos/dbus/bluetooth_manager_client.cc

@@ -5,9 +5,9 @@

#include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h"

#include "base/bind.h"

+#include "base/chromeos/chromeos_version.h"

#include "base/logging.h"

#include "chrome/browser/chromeos/dbus/bluetooth_property.h"

-#include "chrome/browser/chromeos/system/runtime_environment.h"

#include "dbus/bus.h"

#include "dbus/message.h"

#include "dbus/object_path.h"

@@ -306,7 +306,7 @@ BluetoothManagerClient::~BluetoothManagerClient() {

}

BluetoothManagerClient* BluetoothManagerClient::Create(dbus::Bus* bus) {

- if (system::runtime_environment::IsRunningOnChromeOS()) {

+ if (base::chromeos::IsRunningOnChromeOS()) {

return new BluetoothManagerClientImpl(bus);

} else {

return new BluetoothManagerClientStubImpl();