| Index: extensions/browser/api/serial/serial_api.h
|
| diff --git a/extensions/browser/api/serial/serial_api.h b/extensions/browser/api/serial/serial_api.h
|
| index ea943d31d6249868ee2a0f71cf8868b7104479db..03604f67d17e67f2eb68a30c68dc79f12e5f8f5d 100644
|
| --- a/extensions/browser/api/serial/serial_api.h
|
| +++ b/extensions/browser/api/serial/serial_api.h
|
| @@ -16,7 +16,7 @@ namespace extensions {
|
|
|
| class SerialConnection;
|
|
|
| -namespace core_api {
|
| +namespace api {
|
|
|
| class SerialEventDispatcher;
|
|
|
| @@ -271,16 +271,16 @@ class SerialClearBreakFunction : public SerialAsyncApiFunction {
|
| scoped_ptr<serial::ClearBreak::Params> params_;
|
| };
|
|
|
| -} // namespace core_api
|
| +} // namespace api
|
|
|
| } // namespace extensions
|
|
|
| namespace mojo {
|
|
|
| template <>
|
| -struct TypeConverter<linked_ptr<extensions::core_api::serial::DeviceInfo>,
|
| +struct TypeConverter<linked_ptr<extensions::api::serial::DeviceInfo>,
|
| device::serial::DeviceInfoPtr> {
|
| - static linked_ptr<extensions::core_api::serial::DeviceInfo> Convert(
|
| + static linked_ptr<extensions::api::serial::DeviceInfo> Convert(
|
| const device::serial::DeviceInfoPtr& input);
|
| };
|
|
|
|
|