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

Side by Side Diff: chrome/browser/chromeos/dbus/bluetooth_device_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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/dbus/bluetooth_device_client.h" 5 #include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/chromeos/chromeos_version.h"
10 #include "base/logging.h" 11 #include "base/logging.h"
11 #include "base/stl_util.h" 12 #include "base/stl_util.h"
12 #include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h" 13 #include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"
13 #include "chrome/browser/chromeos/dbus/bluetooth_property.h" 14 #include "chrome/browser/chromeos/dbus/bluetooth_property.h"
14 #include "chrome/browser/chromeos/system/runtime_environment.h"
15 #include "dbus/bus.h" 15 #include "dbus/bus.h"
16 #include "dbus/message.h" 16 #include "dbus/message.h"
17 #include "dbus/object_path.h" 17 #include "dbus/object_path.h"
18 #include "dbus/object_proxy.h" 18 #include "dbus/object_proxy.h"
19 #include "third_party/cros_system_api/dbus/service_constants.h" 19 #include "third_party/cros_system_api/dbus/service_constants.h"
20 20
21 namespace chromeos { 21 namespace chromeos {
22 22
23 BluetoothDeviceClient::Properties::Properties(dbus::ObjectProxy* object_proxy, 23 BluetoothDeviceClient::Properties::Properties(dbus::ObjectProxy* object_proxy,
24 PropertyChangedCallback callback) 24 PropertyChangedCallback callback)
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 523
524 BluetoothDeviceClient::BluetoothDeviceClient() { 524 BluetoothDeviceClient::BluetoothDeviceClient() {
525 } 525 }
526 526
527 BluetoothDeviceClient::~BluetoothDeviceClient() { 527 BluetoothDeviceClient::~BluetoothDeviceClient() {
528 } 528 }
529 529
530 BluetoothDeviceClient* BluetoothDeviceClient::Create( 530 BluetoothDeviceClient* BluetoothDeviceClient::Create(
531 dbus::Bus* bus, 531 dbus::Bus* bus,
532 BluetoothAdapterClient* adapter_client) { 532 BluetoothAdapterClient* adapter_client) {
533 if (system::runtime_environment::IsRunningOnChromeOS()) { 533 if (base::chromeos::IsRunningOnChromeOS()) {
534 return new BluetoothDeviceClientImpl(bus, adapter_client); 534 return new BluetoothDeviceClientImpl(bus, adapter_client);
535 } else { 535 } else {
536 return new BluetoothDeviceClientStubImpl(); 536 return new BluetoothDeviceClientStubImpl();
537 } 537 }
538 } 538 }
539 539
540 } // namespace chromeos 540 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698