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

mash/wm/window_layout.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_layout.h"
 
 #include <stdint.h>
 
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
@@ skipping 17 matching lines @@
   // Maximized/fullscreen/presentation windows should be sized to the bounds
   // of the container.
   // If a window has bounds set by the user, those should be respected as long
   // as they meet certain constraints (e.g. visible).
   // TODO(beng): transient windows:
   // Top level non-transient windows with no bounds but a preferred size should
   // opened centered within the work area.
   // Transient windows should be opened centered within their parent.
 
   switch (show_state) {
-    case mus::mojom::SHOW_STATE_MAXIMIZED:
-    case mus::mojom::SHOW_STATE_IMMERSIVE:
-    case mus::mojom::SHOW_STATE_PRESENTATION:
+    case mus::mojom::ShowState::MAXIMIZED:
+    case mus::mojom::ShowState::IMMERSIVE:
+    case mus::mojom::ShowState::PRESENTATION:
       FitToContainer(window);
       break;
-    case mus::mojom::SHOW_STATE_RESTORED: {
+    case mus::mojom::ShowState::RESTORED: {
       if (!user_set_bounds.IsEmpty()) {
         // If the bounds are unchanged, this will do nothing.
         window->SetBounds(user_set_bounds);
       } else if (!preferred_size.IsEmpty()) {
         CenterWindow(window, preferred_size);
       }
     }
-    case mus::mojom::SHOW_STATE_MINIMIZED:
+    case mus::mojom::ShowState::MINIMIZED:
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void WindowLayout::OnWindowSharedPropertyChanged(
     mus::Window* window,
     const std::string& name,
     const std::vector<uint8_t>* old_data,
     const std::vector<uint8_t>* new_data) {
   // TODO(sky): this feels like the wrong place for this logic. Find a better
   // place.
   if (name == mus::mojom::WindowManager::kShowState_Property &&
-      GetWindowShowState(window) == mus::mojom::SHOW_STATE_MAXIMIZED) {
+      GetWindowShowState(window) == mus::mojom::ShowState::MAXIMIZED) {
     SetRestoreBounds(window, window->bounds());
   }
   LayoutManager::OnWindowSharedPropertyChanged(window, name, old_data,
                                                new_data);
 }
 
 void WindowLayout::FitToContainer(mus::Window* window) {
   window->SetBounds(gfx::Rect(owner()->bounds().size()));
 }
 
 void WindowLayout::CenterWindow(mus::Window* window,
                                 const gfx::Size& preferred_size) {
   const gfx::Rect bounds(
       (owner()->bounds().width() - preferred_size.width()) / 2,
       (owner()->bounds().height() - preferred_size.height()) / 2,
       preferred_size.width(), preferred_size.height());
   window->SetBounds(bounds);
 }
 
 }  // namespace wm
 }  // namespace mash