Change mojo enums to be scoped enums in the generated C++ bindings.

components/html_viewer/html_frame.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/html_viewer/html_frame.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <limits>
 #include <utility>
@@ skipping 66 matching lines @@
 
 namespace html_viewer {
 namespace {
 
 const size_t kMaxTitleChars = 4 * 1024;
 
 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;
   }
 }
 
 HTMLFrame* GetPreviousSibling(HTMLFrame* frame) {
   DCHECK(frame->parent());
   auto iter = std::find(frame->parent()->children().begin(),
                         frame->parent()->children().end(), frame);
   return (iter == frame->parent()->children().begin()) ? nullptr : *(--iter);
 }
 
@@ skipping 676 matching lines @@
     event->pointer_data->location->screen_y /=
         global_state()->device_pixel_ratio();
   }
 
   blink::WebWidget* web_widget = GetWebWidget();
 
   if (!touch_handler_ && web_widget)
     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;
   }
 
   if (!web_widget)
     return;
 
   scoped_ptr<blink::WebInputEvent> web_event =
       event.To<scoped_ptr<blink::WebInputEvent>>();
   if (web_event)
@@ skipping 204 matching lines @@
       global_state()->device_pixel_ratio(), rect_in_dip));
   window_->SetBounds(rect_in_pixels);
 }
 
 void HTMLFrame::navigate(const blink::WebURLRequest& request,
                          bool should_replace_current_entry) {
   // TODO: support |should_replace_current_entry|.
   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));
 }
 
 void HTMLFrame::reload(bool ignore_cache, bool is_client_redirect) {
   NOTIMPLEMENTED();
 }
 
 void HTMLFrame::frameRectsChanged(const blink::WebRect& frame_rect) {
   // Only the owner of window can update its size.
   if (!owned_window_)
     return;
 
   const gfx::Rect rect_in_dip(frame_rect.x, frame_rect.y, frame_rect.width,
                               frame_rect.height);
   const gfx::Rect rect_in_pixels(gfx::ConvertRectToPixel(
       global_state()->device_pixel_ratio(), rect_in_dip));
   owned_window_->window()->SetBounds(rect_in_pixels);
 
   if (!surface_layer_)
     return;
 
   surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()),
                                global_state()->device_pixel_ratio(),
                                owned_window_->window()->bounds().size());
 }
 
 }  // namespace mojo