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

Unified Diff: device/bluetooth/bluetooth_adapter_factory.cc

Issue 1917973002: mac: Remove IsOSLion(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tapted Created 4 years, 8 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
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | gpu/config/gpu_test_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_adapter_factory.cc
diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc
index dfea7906944e9cfb011312c2c63d4a88481cbab0..088f9a032b6724a22bd634e356f2c92589682480 100644
--- a/device/bluetooth/bluetooth_adapter_factory.cc
+++ b/device/bluetooth/bluetooth_adapter_factory.cc
@@ -13,10 +13,6 @@
#include "build/build_config.h"
#include "device/bluetooth/bluetooth_adapter.h"
-#if defined(OS_MACOSX)
-#include "base/mac/mac_util.h"
-#endif
-
namespace device {
namespace {
@@ -60,10 +56,8 @@ bool BluetoothAdapterFactory::IsBluetoothAdapterAvailable() {
if (default_adapter.Get())
return true;
#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_WIN) || \
- defined(OS_LINUX)
+ defined(OS_LINUX) || defined(OS_MACOSX)
return true;
-#elif defined(OS_MACOSX)
- return base::mac::IsOSLionOrLater();
#else
return false;
#endif
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | gpu/config/gpu_test_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698