Index: extensions/common/api/bluetooth/bluetooth_manifest_permission.cc |
diff --git a/chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc b/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc |
similarity index 92% |
rename from chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc |
rename to extensions/common/api/bluetooth/bluetooth_manifest_permission.cc |
index 8313caeefefc7664d89a9e9601c55625f6d09248..e441e554e387260f9697837d238751a9b3679f2a 100644 |
--- a/chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc |
+++ b/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc |
@@ -2,19 +2,19 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.h" |
+#include "extensions/common/api/bluetooth/bluetooth_manifest_permission.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/stl_util.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/values.h" |
-#include "chrome/common/extensions/api/bluetooth/bluetooth_manifest_data.h" |
-#include "chrome/common/extensions/api/manifest_types.h" |
-#include "chrome/grit/generated_resources.h" |
#include "device/bluetooth/bluetooth_uuid.h" |
+#include "extensions/common/api/bluetooth/bluetooth_manifest_data.h" |
+#include "extensions/common/api/extensions_manifest_types.h" |
#include "extensions/common/error_utils.h" |
#include "extensions/common/extension_messages.h" |
#include "extensions/common/manifest_constants.h" |
+#include "grit/extensions_strings.h" |
#include "ipc/ipc_message.h" |
#include "ui/base/l10n/l10n_util.h" |
@@ -66,8 +66,8 @@ BluetoothManifestPermission::~BluetoothManifestPermission() {} |
scoped_ptr<BluetoothManifestPermission> BluetoothManifestPermission::FromValue( |
const base::Value& value, |
base::string16* error) { |
- scoped_ptr<api::manifest_types::Bluetooth> bluetooth = |
- api::manifest_types::Bluetooth::FromValue(value, error); |
+ scoped_ptr<core_api::extensions_manifest_types::Bluetooth> bluetooth = |
+ core_api::extensions_manifest_types::Bluetooth::FromValue(value, error); |
if (!bluetooth) |
return scoped_ptr<BluetoothManifestPermission>(); |
@@ -153,7 +153,7 @@ bool BluetoothManifestPermission::FromValue(const base::Value* value) { |
} |
scoped_ptr<base::Value> BluetoothManifestPermission::ToValue() const { |
- api::manifest_types::Bluetooth bluetooth; |
+ core_api::extensions_manifest_types::Bluetooth bluetooth; |
bluetooth.uuids.reset(new std::vector<std::string>(uuids_.begin(), |
uuids_.end())); |
return bluetooth.ToValue().PassAs<base::Value>(); |