OLD | NEW |
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/cryptohome_client.h" | 5 #include "chrome/browser/chromeos/dbus/cryptohome_client.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/chromeos/chromeos_version.h" |
8 #include "base/synchronization/waitable_event.h" | 9 #include "base/synchronization/waitable_event.h" |
9 #include "chrome/browser/chromeos/system/runtime_environment.h" | |
10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
11 #include "dbus/bus.h" | 11 #include "dbus/bus.h" |
12 #include "dbus/message.h" | 12 #include "dbus/message.h" |
13 #include "dbus/object_path.h" | 13 #include "dbus/object_path.h" |
14 #include "dbus/object_proxy.h" | 14 #include "dbus/object_proxy.h" |
15 #include "third_party/cros_system_api/dbus/service_constants.h" | 15 #include "third_party/cros_system_api/dbus/service_constants.h" |
16 | 16 |
17 namespace chromeos { | 17 namespace chromeos { |
18 | 18 |
19 namespace { | 19 namespace { |
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
650 | 650 |
651 //////////////////////////////////////////////////////////////////////////////// | 651 //////////////////////////////////////////////////////////////////////////////// |
652 // CryptohomeClient | 652 // CryptohomeClient |
653 | 653 |
654 CryptohomeClient::CryptohomeClient() {} | 654 CryptohomeClient::CryptohomeClient() {} |
655 | 655 |
656 CryptohomeClient::~CryptohomeClient() {} | 656 CryptohomeClient::~CryptohomeClient() {} |
657 | 657 |
658 // static | 658 // static |
659 CryptohomeClient* CryptohomeClient::Create(dbus::Bus* bus) { | 659 CryptohomeClient* CryptohomeClient::Create(dbus::Bus* bus) { |
660 if (system::runtime_environment::IsRunningOnChromeOS()) | 660 if (base::chromeos::IsRunningOnChromeOS()) |
661 return new CryptohomeClientImpl(bus); | 661 return new CryptohomeClientImpl(bus); |
662 else | 662 else |
663 return new CryptohomeClientStubImpl(); | 663 return new CryptohomeClientStubImpl(); |
664 } | 664 } |
665 | 665 |
666 } // namespace chromeos | 666 } // namespace chromeos |
OLD | NEW |