summaryrefslogtreecommitdiffstats
path: root/components/html_viewer/html_frame_tree_manager.cc
diff options
context:
space:
mode:
authorsammc <sammc@chromium.org>2016-01-20 21:30:18 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-21 05:31:02 +0000
commit16fb38a8b87fe700645055e472d84de7aefe48a5 (patch)
tree02d83267f9a8a9f8e182c6a857347a7a683e81e6 /components/html_viewer/html_frame_tree_manager.cc
parentc8a1187b4dfc11061d8ba792c73225196c56c6aa (diff)
downloadchromium_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 'components/html_viewer/html_frame_tree_manager.cc')
-rw-r--r--components/html_viewer/html_frame_tree_manager.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/components/html_viewer/html_frame_tree_manager.cc b/components/html_viewer/html_frame_tree_manager.cc
index 58d7122..1323b5f 100644
--- a/components/html_viewer/html_frame_tree_manager.cc
+++ b/components/html_viewer/html_frame_tree_manager.cc
@@ -100,10 +100,9 @@ HTMLFrame* HTMLFrameTreeManager::CreateFrameAndAttachToTree(
DVLOG(2) << "HTMLFrameTreeManager::CreateFrameAndAttachToTree "
<< " frame_tree=" << frame_tree << " use_existing="
<< (window_connect_type ==
- web_view::mojom::WINDOW_CONNECT_TYPE_USE_EXISTING)
+ web_view::mojom::WindowConnectType::USE_EXISTING)
<< " frame_id=" << window_id;
- if (window_connect_type ==
- web_view::mojom::WINDOW_CONNECT_TYPE_USE_EXISTING &&
+ if (window_connect_type == web_view::mojom::WindowConnectType::USE_EXISTING &&
!frame_tree) {
DVLOG(1) << "was told to use existing window but do not have frame tree";
return nullptr;
@@ -114,7 +113,7 @@ HTMLFrame* HTMLFrameTreeManager::CreateFrameAndAttachToTree(
frame_tree->Init(delegate, window, frame_data, change_id);
(*instances_)[frame_data[0]->frame_id] = frame_tree;
} else if (window_connect_type ==
- web_view::mojom::WINDOW_CONNECT_TYPE_USE_EXISTING) {
+ web_view::mojom::WindowConnectType::USE_EXISTING) {
HTMLFrame* existing_frame = frame_tree->root_->FindFrame(window_id);
if (!existing_frame) {
DVLOG(1) << "was told to use existing window but could not find window";