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

mash/wm/window_manager_application.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/window_manager_application.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 45 matching lines @@
 }
 
 bool WindowManagerApplication::WindowIsContainer(
     const mus::Window* window) const {
   return window && window->parent() == root_;
 }
 
 void WindowManagerApplication::AddAccelerators() {
   window_tree_host_->AddAccelerator(
       kWindowSwitchCmd,
-      mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_TAB,
-                            mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+      mus::CreateKeyMatcher(mus::mojom::KeyboardCode::TAB,
+                            mus::mojom::kEventFlagControlDown),
       base::Bind(&AssertTrue));
 }
 
 void WindowManagerApplication::OnAcceleratorRegistrarDestroyed(
     AcceleratorRegistrarImpl* registrar) {
   accelerator_registrars_.erase(registrar);
 }
 
 void WindowManagerApplication::Initialize(mojo::ApplicationImpl* app) {
   app_ = app;
@@ skipping 31 matching lines @@
         }
       }
   }
 }
 
 void WindowManagerApplication::OnEmbed(mus::Window* root) {
   root_ = root;
   root_->AddObserver(this);
   CreateContainers();
   background_layout_.reset(new BackgroundLayout(
-      GetWindowForContainer(mojom::CONTAINER_USER_BACKGROUND)));
+      GetWindowForContainer(mojom::Container::USER_BACKGROUND)));
   shelf_layout_.reset(
-      new ShelfLayout(GetWindowForContainer(mojom::CONTAINER_USER_SHELF)));
+      new ShelfLayout(GetWindowForContainer(mojom::Container::USER_SHELF)));
 
-  mus::Window* window = GetWindowForContainer(mojom::CONTAINER_USER_WINDOWS);
+  mus::Window* window = GetWindowForContainer(mojom::Container::USER_WINDOWS);
   window_layout_.reset(
-      new WindowLayout(GetWindowForContainer(mojom::CONTAINER_USER_WINDOWS)));
+      new WindowLayout(GetWindowForContainer(mojom::Container::USER_WINDOWS)));
   window_tree_host_->AddActivationParent(window->id());
   window_tree_host_->SetTitle("Mash");
 
   AddAccelerators();
 
   ui_init_.reset(new ui::mojo::UIInit(views::GetDisplaysFromWindow(root)));
   aura_init_.reset(new views::AuraInit(app_, "mash_wm_resources.pak"));
   window_manager_->Initialize(this);
 
   for (auto request : requests_)
@@ skipping 46 matching lines @@
   DCHECK_EQ(window, root_);
   root_->RemoveObserver(this);
   // Delete the |window_manager_| here so that WindowManager doesn't have to
   // worry about the possibility of |root_| being null.
   window_manager_.reset();
   root_ = nullptr;
 }
 
 void WindowManagerApplication::CreateContainers() {
   for (uint16_t container =
-           static_cast<uint16_t>(mojom::CONTAINER_ALL_USER_BACKGROUND);
-       container < static_cast<uint16_t>(mojom::CONTAINER_COUNT); ++container) {
+           static_cast<uint16_t>(mojom::Container::ALL_USER_BACKGROUND);
+       container < static_cast<uint16_t>(mojom::Container::COUNT);
+       ++container) {
     mus::Window* window = root_->connection()->NewWindow();
     DCHECK_EQ(mus::LoWord(window->id()), container)
         << "Containers must be created before other windows!";
     window->SetBounds(root_->bounds());
     window->SetVisible(true);
     root_->AddChild(window);
   }
 }
 
 }  // namespace wm
 }  // namespace mash