diff options
author | sammc <sammc@chromium.org> | 2016-01-20 21:30:18 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-21 05:31:02 +0000 |
commit | 16fb38a8b87fe700645055e472d84de7aefe48a5 (patch) | |
tree | 02d83267f9a8a9f8e182c6a857347a7a683e81e6 /sql/mojo/vfs_unittest.cc | |
parent | c8a1187b4dfc11061d8ba792c73225196c56c6aa (diff) | |
download | chromium_src-16fb38a8b87fe700645055e472d84de7aefe48a5.zip chromium_src-16fb38a8b87fe700645055e472d84de7aefe48a5.tar.gz chromium_src-16fb38a8b87fe700645055e472d84de7aefe48a5.tar.bz2 |
Change mojo enums to be scoped enums in the generated C++ bindings.
Some mojo enums were previously not proper enums: they were constants
for bitfields. These have been replaced by const int32s in the mojoms:
- mus.mojom.EventFlags
- mus.mojom.MouseEventFlags
- mus.mojom.ResizeBehavior
- mus.mojom.WindowTree.AccessPolicy
Some mojo enum values now conflict with macros (mostly on Windows) and
needed to change:
- mus.mojom.Cursor.NULL became CURSOR_NULL (again)
- mus.mojom.KeyboardCode.DELETE became DELETE_KEY
- mus.mojom.WindowManagerErrorCode.ERROR_ACCESS_DENIED became
ACCESS_DENIED
- device.usb.TransferDirection.IN became INBOUND
- device.usb.TransferDirection.OUT became OUTBOUND
- device.usb.TransferStatus.ERROR became TRANSFER_ERROR
- device.NFCRecordType.OPAQUE became OPAQUE_RECORD
- media.interfaces.Decryptor.Status.ERROR became DECRYPTION_ERROR
- skia.AlphaType.OPAQUE became ALPHA_TYPE_OPAQUE
Review URL: https://codereview.chromium.org/1527183003
Cr-Commit-Position: refs/heads/master@{#370632}
Diffstat (limited to 'sql/mojo/vfs_unittest.cc')
-rw-r--r-- | sql/mojo/vfs_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mojo/vfs_unittest.cc b/sql/mojo/vfs_unittest.cc index e51f1bd..e53ea11 100644 --- a/sql/mojo/vfs_unittest.cc +++ b/sql/mojo/vfs_unittest.cc @@ -58,12 +58,12 @@ class VFSTest : public mojo::test::ApplicationTestBase, filesystem::FileSystemClientPtr client; binding_.Bind(GetProxy(&client)); - filesystem::FileError error = filesystem::FILE_ERROR_FAILED; + filesystem::FileError error = filesystem::FileError::FAILED; filesystem::DirectoryPtr directory; files_->OpenFileSystem("temp", GetProxy(&directory), std::move(client), mojo::Capture(&error)); ASSERT_TRUE(files_.WaitForIncomingResponse()); - ASSERT_EQ(filesystem::FILE_ERROR_OK, error); + ASSERT_EQ(filesystem::FileError::OK, error); vfs_.reset(new ScopedMojoFilesystemVFS(std::move(directory))); } |