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

Unified Diff: chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.cc

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: renamed 'bluetooth' target to 'device_bluetooth'. Created 8 years, 2 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
Index: chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.cc
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.cc b/chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.cc
deleted file mode 100644
index eb626220d779078ac039a8b627d2800bf9d8f730..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// TODO(youngki): Guard the ChromeOS specific part with "#ifdef CHROME_OS" block
-// once we move this code into common directory.
-
-#include "base/lazy_instance.h"
-#include "base/memory/ref_counted.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.h"
-
-namespace {
-
-// Shared default adapter instance, we don't want to keep this class around
-// if nobody is using it so use a WeakPtr and create the object when needed;
-// since Google C++ Style (and clang's static analyzer) forbids us having
-// exit-time destructors we use a leaky lazy instance for it.
-base::LazyInstance<base::WeakPtr<chromeos::BluetoothAdapter> >::Leaky
- default_adapter = LAZY_INSTANCE_INITIALIZER;
-
-} // namespace
-
-namespace chromeos {
-
-// static
-scoped_refptr<BluetoothAdapter> BluetoothAdapterFactory::DefaultAdapter() {
- if (!default_adapter.Get().get()) {
- BluetoothAdapterChromeOs* new_adapter = new BluetoothAdapterChromeOs;
- new_adapter->TrackDefaultAdapter();
- default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
- }
-
- return scoped_refptr<BluetoothAdapter>(default_adapter.Get());
-}
-
-// static
-BluetoothAdapter* BluetoothAdapterFactory::Create(const std::string& address) {
- BluetoothAdapterChromeOs* adapter = new BluetoothAdapterChromeOs;
- adapter->FindAdapter(address);
- return adapter;
-}
-
-} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698