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

Side by Side Diff: chrome/browser/chromeos/dbus/bluetooth_adapter_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_adapter_client.h" 5 #include "chrome/browser/chromeos/dbus/bluetooth_adapter_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_device_client.h" 13 #include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"
13 #include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h" 14 #include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h"
14 #include "chrome/browser/chromeos/dbus/bluetooth_property.h" 15 #include "chrome/browser/chromeos/dbus/bluetooth_property.h"
15 #include "chrome/browser/chromeos/system/runtime_environment.h"
16 #include "dbus/bus.h" 16 #include "dbus/bus.h"
17 #include "dbus/message.h" 17 #include "dbus/message.h"
18 #include "dbus/object_path.h" 18 #include "dbus/object_path.h"
19 #include "dbus/object_proxy.h" 19 #include "dbus/object_proxy.h"
20 #include "third_party/cros_system_api/dbus/service_constants.h" 20 #include "third_party/cros_system_api/dbus/service_constants.h"
21 21
22 namespace chromeos { 22 namespace chromeos {
23 23
24 BluetoothAdapterClient::Properties::Properties(dbus::ObjectProxy* object_proxy, 24 BluetoothAdapterClient::Properties::Properties(dbus::ObjectProxy* object_proxy,
25 PropertyChangedCallback callback) 25 PropertyChangedCallback callback)
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 793
794 BluetoothAdapterClient::BluetoothAdapterClient() { 794 BluetoothAdapterClient::BluetoothAdapterClient() {
795 } 795 }
796 796
797 BluetoothAdapterClient::~BluetoothAdapterClient() { 797 BluetoothAdapterClient::~BluetoothAdapterClient() {
798 } 798 }
799 799
800 BluetoothAdapterClient* BluetoothAdapterClient::Create( 800 BluetoothAdapterClient* BluetoothAdapterClient::Create(
801 dbus::Bus* bus, 801 dbus::Bus* bus,
802 BluetoothManagerClient* manager_client) { 802 BluetoothManagerClient* manager_client) {
803 if (system::runtime_environment::IsRunningOnChromeOS()) { 803 if (base::chromeos::IsRunningOnChromeOS()) {
804 return new BluetoothAdapterClientImpl(bus, manager_client); 804 return new BluetoothAdapterClientImpl(bus, manager_client);
805 } else { 805 } else {
806 return new BluetoothAdapterClientStubImpl(); 806 return new BluetoothAdapterClientStubImpl();
807 } 807 }
808 } 808 }
809 809
810 } // namespace chromeos 810 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698