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

Unified Diff: components/html_viewer/html_frame.cc

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals
Patch Set: rebase Created 4 years, 11 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: components/html_viewer/html_frame.cc
diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc
index 22f3ca9836ce93fe456cc20806c4b248bf7bdce3..3da5aeba0dc1e70a9089ce51de8cd63a60edc2d2 100644
--- a/components/html_viewer/html_frame.cc
+++ b/components/html_viewer/html_frame.cc
@@ -84,14 +84,14 @@ web_view::mojom::NavigationTargetType WebNavigationPolicyToNavigationTarget(
blink::WebNavigationPolicy policy) {
switch (policy) {
case blink::WebNavigationPolicyCurrentTab:
- return web_view::mojom::NAVIGATION_TARGET_TYPE_EXISTING_FRAME;
+ return web_view::mojom::NavigationTargetType::EXISTING_FRAME;
case blink::WebNavigationPolicyNewBackgroundTab:
case blink::WebNavigationPolicyNewForegroundTab:
case blink::WebNavigationPolicyNewWindow:
case blink::WebNavigationPolicyNewPopup:
- return web_view::mojom::NAVIGATION_TARGET_TYPE_NEW_FRAME;
+ return web_view::mojom::NavigationTargetType::NEW_FRAME;
default:
- return web_view::mojom::NAVIGATION_TARGET_TYPE_NO_PREFERENCE;
+ return web_view::mojom::NavigationTargetType::NO_PREFERENCE;
}
}
@@ -788,12 +788,12 @@ void HTMLFrame::OnWindowInputEvent(mus::Window* window,
touch_handler_.reset(new TouchHandler(web_widget));
if (touch_handler_ &&
- (event->action == mus::mojom::EVENT_TYPE_POINTER_DOWN ||
- event->action == mus::mojom::EVENT_TYPE_POINTER_UP ||
- event->action == mus::mojom::EVENT_TYPE_POINTER_CANCEL ||
- event->action == mus::mojom::EVENT_TYPE_POINTER_MOVE) &&
+ (event->action == mus::mojom::EventType::POINTER_DOWN ||
+ event->action == mus::mojom::EventType::POINTER_UP ||
+ event->action == mus::mojom::EventType::POINTER_CANCEL ||
+ event->action == mus::mojom::EventType::POINTER_MOVE) &&
event->pointer_data &&
- event->pointer_data->kind == mus::mojom::POINTER_KIND_TOUCH) {
+ event->pointer_data->kind == mus::mojom::PointerKind::TOUCH) {
touch_handler_->OnTouchEvent(*event);
return;
}
@@ -1018,7 +1018,7 @@ void HTMLFrame::navigate(const blink::WebURLRequest& request,
NOTIMPLEMENTED(); // for |should_replace_current_entry
mojo::URLRequestPtr url_request = mojo::URLRequest::From(request);
GetServerFrame()->RequestNavigate(
- web_view::mojom::NAVIGATION_TARGET_TYPE_EXISTING_FRAME, id_,
+ web_view::mojom::NavigationTargetType::EXISTING_FRAME, id_,
std::move(url_request));
}
« no previous file with comments | « components/html_viewer/document_resource_waiter.cc ('k') | components/html_viewer/html_frame_tree_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698