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

mash/wm/user_window_controller_impl.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/user_window_controller_impl.h"
 
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
@@ skipping 62 matching lines @@
   DCHECK(state);
   DCHECK(!state_);
   state_ = state;
   GetUserWindowContainer()->AddObserver(this);
   window_title_observer_.reset(new WindowTitleObserver(this));
   for (auto iter : GetUserWindowContainer()->children())
     iter->AddObserver(window_title_observer_.get());
 }
 
 mus::Window* UserWindowControllerImpl::GetUserWindowContainer() const {
-  return state_->GetWindowForContainer(mojom::CONTAINER_USER_WINDOWS);
+  return state_->GetWindowForContainer(mojom::Container::USER_WINDOWS);
 }
 
 void UserWindowControllerImpl::OnTreeChanging(const TreeChangeParams& params) {
   DCHECK(state_);
   if (user_window_observer_) {
     mus::Window* user_window_container = GetUserWindowContainer();
     if (params.new_parent == user_window_container) {
       params.target->AddObserver(window_title_observer_.get());
       user_window_observer_->OnUserWindowAdded(GetUserWindow(params.target));
     } else if (params.old_parent == user_window_container) {
@@ skipping 17 matching lines @@
 }
 
 void UserWindowControllerImpl::FocusUserWindow(uint32_t window_id) {
   mus::Window* window = GetUserWindowContainer()->GetChildById(window_id);
   if (window)
     window->SetFocus();
 }
 
 }  // namespace wm
 }  // namespace mash