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

mandoline/ui/desktop_ui/browser_window.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 "mandoline/ui/desktop_ui/browser_window.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 194 matching lines @@
   host_->SetSize(mojo::Size::From(gfx::Size(1280, 800)));
 
   root_->AddChild(content_);
   host_->AddActivationParent(root_->id());
   content_->SetVisible(true);
 
   web_view_.Init(app_, content_);
 
   host_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::CLOSE),
-      mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_W,
-                            mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+      mus::CreateKeyMatcher(mus::mojom::KeyboardCode::W,
+                            mus::mojom::kEventFlagControlDown),
       mus::mojom::WindowTreeHost::AddAcceleratorCallback());
   host_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::FOCUS_OMNIBOX),
-      mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_L,
-                            mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+      mus::CreateKeyMatcher(mus::mojom::KeyboardCode::L,
+                            mus::mojom::kEventFlagControlDown),
       mus::mojom::WindowTreeHost::AddAcceleratorCallback());
   host_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::NEW_WINDOW),
-      mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N,
-                            mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+      mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
+                            mus::mojom::kEventFlagControlDown),
       mus::mojom::WindowTreeHost::AddAcceleratorCallback());
   host_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::SHOW_FIND),
-      mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_F,
-                            mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+      mus::CreateKeyMatcher(mus::mojom::KeyboardCode::F,
+                            mus::mojom::kEventFlagControlDown),
       mus::mojom::WindowTreeHost::AddAcceleratorCallback());
   host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::GO_BACK),
-                        mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_LEFT,
-                                              mus::mojom::EVENT_FLAGS_ALT_DOWN),
+                        mus::CreateKeyMatcher(mus::mojom::KeyboardCode::LEFT,
+                                              mus::mojom::kEventFlagAltDown),
                         mus::mojom::WindowTreeHost::AddAcceleratorCallback());
   host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::GO_FORWARD),
-                        mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_RIGHT,
-                                              mus::mojom::EVENT_FLAGS_ALT_DOWN),
+                        mus::CreateKeyMatcher(mus::mojom::KeyboardCode::RIGHT,
+                                              mus::mojom::kEventFlagAltDown),
                         mus::mojom::WindowTreeHost::AddAcceleratorCallback());
   // Now that we're ready, load the default url.
   LoadURL(default_url_);
 
   // Record the time spent opening initial tabs, used for performance testing.
   const base::TimeDelta open_tabs_delta =
       base::TimeTicks::Now() - display_ticks;
 
   // Record the browser startup time metrics, used for performance testing.
   static bool recorded_browser_startup_metrics = false;
@@ skipping 62 matching lines @@
 
 void BrowserWindow::LoadingStateChanged(bool is_loading, double progress) {
   progress_bar_->SetIsLoading(is_loading);
   progress_bar_->SetProgress(progress);
 }
 
 void BrowserWindow::BackForwardChanged(
     web_view::mojom::ButtonState back_button,
     web_view::mojom::ButtonState forward_button) {
   toolbar_view_->SetBackForwardEnabled(
-      back_button == web_view::mojom::ButtonState::BUTTON_STATE_ENABLED,
-      forward_button == web_view::mojom::ButtonState::BUTTON_STATE_ENABLED);
+      back_button == web_view::mojom::ButtonState::ENABLED,
+      forward_button == web_view::mojom::ButtonState::ENABLED);
 }
 
 void BrowserWindow::TitleChanged(const mojo::String& title) {
   base::string16 formatted =
       title.is_null() ? base::ASCIIToUTF16("Untitled")
                       : title.To<base::string16>() +
           base::ASCIIToUTF16(" - Mandoline");
   host_->SetTitle(mojo::String::From(formatted));
 }
 
@@ skipping 67 matching lines @@
   widget_delegate->GetContentsView()->SetLayoutManager(
       new LayoutManagerImpl(this));
 
   find_bar_view_ = new FindBarView(this);
   widget_delegate->GetContentsView()->AddChildView(find_bar_view_);
 
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.native_widget = new views::NativeWidgetMus(
-      widget, app_->shell(), root, mus::mojom::SURFACE_TYPE_DEFAULT);
+      widget, app_->shell(), root, mus::mojom::SurfaceType::DEFAULT);
   params.delegate = widget_delegate;
   params.bounds = root_->bounds();
   widget->Init(params);
   widget->Show();
   root_->SetFocus();
 }
 
 void BrowserWindow::EmbedOmnibox() {
   mus::mojom::WindowTreeClientPtr view_tree_client;
   omnibox_->GetWindowTreeClient(GetProxy(&view_tree_client));
@@ skipping 29 matching lines @@
   content_bounds.set_width(DIPSToPixels(progress_bar_bounds.width()));
   content_bounds.set_height(host->bounds().height() - content_bounds.y() -
                             DIPSToPixels(10));
   content_->SetBounds(content_bounds);
 
   // The omnibox view bounds are in physical pixels.
   omnibox_view_->SetBounds(bounds_in_physical_pixels);
 }
 
 }  // namespace mandoline