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

mash/wm/non_client_frame_controller.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 "mash/wm/non_client_frame_controller.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "components/mus/public/cpp/property_type_converters.h"
@@ skipping 75 matching lines @@
 };
 
 class WmNativeWidgetMus : public views::NativeWidgetMus {
  public:
   WmNativeWidgetMus(views::internal::NativeWidgetDelegate* delegate,
                     mojo::Shell* shell,
                     mus::Window* window)
       : NativeWidgetMus(delegate,
                         shell,
                         window,
-                        mus::mojom::SURFACE_TYPE_UNDERLAY) {}
+                        mus::mojom::SurfaceType::UNDERLAY) {}
   ~WmNativeWidgetMus() override {
   }
 
   // NativeWidgetMus:
   views::NonClientFrameView* CreateNonClientFrameView() override {
     views::Widget* widget =
         static_cast<views::internal::NativeWidgetPrivate*>(this)->GetWidget();
     NonClientFrameViewMash* frame_view =
         new NonClientFrameViewMash(widget, window());
     move_event_handler_.reset(new MoveEventHandler(window(), GetNativeView()));
@@ skipping 107 matching lines @@
   return window_->GetSharedProperty<base::string16>(
       mus::mojom::WindowManager::kWindowTitle_Property);
 }
 
 views::View* NonClientFrameController::GetContentsView() {
   return this;
 }
 
 bool NonClientFrameController::CanResize() const {
   return window_ &&
-         (GetResizeBehavior(window_) &
-          mus::mojom::RESIZE_BEHAVIOR_CAN_RESIZE) != 0;
+         (GetResizeBehavior(window_) & mus::mojom::kResizeBehaviorCanResize) !=
+             0;
 }
 
 bool NonClientFrameController::CanMaximize() const {
   return window_ &&
          (GetResizeBehavior(window_) &
-          mus::mojom::RESIZE_BEHAVIOR_CAN_MAXIMIZE) != 0;
+          mus::mojom::kResizeBehaviorCanMaximize) != 0;
 }
 
 bool NonClientFrameController::CanMinimize() const {
   return window_ &&
          (GetResizeBehavior(window_) &
-          mus::mojom::RESIZE_BEHAVIOR_CAN_MINIMIZE) != 0;
+          mus::mojom::kResizeBehaviorCanMinimize) != 0;
 }
 
 views::ClientView* NonClientFrameController::CreateClientView(
     views::Widget* widget) {
   return new ClientViewMus(widget, GetContentsView(), this);
 }
 
 void NonClientFrameController::OnWindowSharedPropertyChanged(
     mus::Window* window,
     const std::string& name,
     const std::vector<uint8_t>* old_data,
     const std::vector<uint8_t>* new_data) {
   if (name == mus::mojom::WindowManager::kResizeBehavior_Property)
     widget_->OnSizeConstraintsChanged();
   else if (name == mus::mojom::WindowManager::kWindowTitle_Property)
     widget_->UpdateWindowTitle();
 }
 
 void NonClientFrameController::OnWindowDestroyed(mus::Window* window) {
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace wm
 }  // namespace mash