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

Unified Diff: extensions/browser/api/bluetooth/bluetooth_event_router.cc

Issue 420663003: Extensions: Move bluetooth APIs to extensions/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android, gn Created 6 years, 4 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: extensions/browser/api/bluetooth/bluetooth_event_router.cc
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc b/extensions/browser/api/bluetooth/bluetooth_event_router.cc
similarity index 95%
rename from chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc
rename to extensions/browser/api/bluetooth/bluetooth_event_router.cc
index f420726ae8019a30d3747be5e5c4a7ffdb351e31..1064d0bdad177dc91b4e3dac3d5cd8f34e6a9b1b 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_event_router.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h"
+#include "extensions/browser/api/bluetooth/bluetooth_event_router.h"
#include <map>
#include <string>
@@ -15,26 +15,26 @@
#include "base/memory/scoped_vector.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/extensions/api/bluetooth/bluetooth_api_pairing_delegate.h"
-#include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h"
-#include "chrome/browser/extensions/api/bluetooth/bluetooth_private_api.h"
-#include "chrome/common/extensions/api/bluetooth.h"
-#include "chrome/common/extensions/api/bluetooth_private.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_adapter_factory.h"
#include "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/bluetooth_discovery_session.h"
+#include "extensions/browser/api/bluetooth/bluetooth_api_pairing_delegate.h"
+#include "extensions/browser/api/bluetooth/bluetooth_api_utils.h"
+#include "extensions/browser/api/bluetooth/bluetooth_private_api.h"
#include "extensions/browser/event_router.h"
#include "extensions/browser/extension_host.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/notification_types.h"
+#include "extensions/common/api/bluetooth.h"
+#include "extensions/common/api/bluetooth_private.h"
namespace extensions {
-namespace bluetooth = api::bluetooth;
-namespace bt_private = api::bluetooth_private;
+namespace bluetooth = core_api::bluetooth;
+namespace bt_private = core_api::bluetooth_private;
BluetoothEventRouter::BluetoothEventRouter(content::BrowserContext* context)
: browser_context_(context),
@@ -284,7 +284,7 @@ void BluetoothEventRouter::OnListenerRemoved() {
void BluetoothEventRouter::DispatchAdapterStateEvent() {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
- api::bluetooth::AdapterState state;
+ core_api::bluetooth::AdapterState state;
PopulateAdapterState(*adapter_.get(), &state);
scoped_ptr<base::ListValue> args =

Powered by Google App Engine
This is Rietveld 408576698