Make ui::PlatformWindowType a enum class

Also dropped prefix from enum values names as they are not necesary
with enum class.

Change-Id: Iff808da768321a91a8b841db3aa133935ccab477
Reviewed-on: https://chromium-review.googlesource.com/1104789
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568527}

ui/ozone/platform/wayland/wayland_pointer_unittest.cc

@@ -50,7 +50,7 @@ TEST_P(WaylandPointerTest, Leave) {
       .WillOnce(SaveArg<0>(&other_widget));
   PlatformWindowInitProperties properties;
   properties.bounds = gfx::Rect(0, 0, 10, 10);
-  properties.type = PlatformWindowType::PLATFORM_WINDOW_TYPE_WINDOW;
+  properties.type = PlatformWindowType::kWindow;
   ASSERT_TRUE(other_window.Initialize(std::move(properties)));
   ASSERT_NE(other_widget, gfx::kNullAcceleratedWidget);
 

ui/ozone/platform/wayland/wayland_test.cc

@@ -41,7 +41,7 @@ void WaylandTest::SetUp() {
       .WillOnce(SaveArg<0>(&widget_));
   PlatformWindowInitProperties properties;
   properties.bounds = gfx::Rect(0, 0, 800, 600);
-  properties.type = PlatformWindowType::PLATFORM_WINDOW_TYPE_WINDOW;
+  properties.type = PlatformWindowType::kWindow;
   ASSERT_TRUE(window_->Initialize(std::move(properties)));
   ASSERT_NE(widget_, gfx::kNullAcceleratedWidget);
 

ui/ozone/platform/wayland/wayland_window.cc

@@ -110,19 +110,16 @@ bool WaylandWindow::Initialize(PlatformWindowInitProperties properties) {
 
   ui::PlatformWindowType ui_window_type = properties.type;
   switch (ui_window_type) {
-    case ui::PlatformWindowType::PLATFORM_WINDOW_TYPE_MENU:
-    case ui::PlatformWindowType::PLATFORM_WINDOW_TYPE_POPUP:
+    case ui::PlatformWindowType::kMenu:
+    case ui::PlatformWindowType::kPopup:
       // TODO(msisov, jkim): Handle notification windows, which are marked
       // as popup windows as well. Those are the windows that do not have
       // parents and pop up when the browser receives a notification.
       CreateXdgPopup();
       break;
-    case ui::PlatformWindowType::PLATFORM_WINDOW_TYPE_WINDOW:
+    case ui::PlatformWindowType::kWindow:
       CreateXdgSurface();
       break;
-    default:
-      NOTREACHED() << "Not supported window type: type=" << ui_window_type;
-      break;
   }
 
   connection_->ScheduleFlush();

ui/ozone/platform/wayland/wayland_window_unittest.cc

@@ -483,8 +483,8 @@ TEST_P(WaylandWindowTest, CreateAndDestroyMenuWindow) {
   EXPECT_CALL(menu_window_delegate, OnAcceleratedWidgetDestroyed()).Times(1);
 
   std::unique_ptr<WaylandWindow> menu_window = CreateWaylandWindowWithParams(
-      PlatformWindowType::PLATFORM_WINDOW_TYPE_MENU, widget_,
-      gfx::Rect(0, 0, 10, 10), &menu_window_delegate);
+      PlatformWindowType::kMenu, widget_, gfx::Rect(0, 0, 10, 10),
+      &menu_window_delegate);
 
   Sync();
 }
@@ -496,8 +496,8 @@ TEST_P(WaylandWindowTest, CreateAndDestroyNestedMenuWindow) {
       .WillOnce(SaveArg<0>(&menu_window_widget));
 
   std::unique_ptr<WaylandWindow> menu_window = CreateWaylandWindowWithParams(
-      PlatformWindowType::PLATFORM_WINDOW_TYPE_MENU, widget_,
-      gfx::Rect(0, 0, 10, 10), &menu_window_delegate);
+      PlatformWindowType::kMenu, widget_, gfx::Rect(0, 0, 10, 10),
+      &menu_window_delegate);
   ASSERT_NE(menu_window_widget, gfx::kNullAcceleratedWidget);
 
   Sync();
@@ -505,7 +505,7 @@ TEST_P(WaylandWindowTest, CreateAndDestroyNestedMenuWindow) {
   MockPlatformWindowDelegate nested_menu_window_delegate;
   std::unique_ptr<WaylandWindow> nested_menu_window =
       CreateWaylandWindowWithParams(
-          PlatformWindowType::PLATFORM_WINDOW_TYPE_MENU, menu_window_widget,
+          PlatformWindowType::kMenu, menu_window_widget,
           gfx::Rect(20, 0, 10, 10), &nested_menu_window_delegate);
 
   Sync();
@@ -514,8 +514,8 @@ TEST_P(WaylandWindowTest, CreateAndDestroyNestedMenuWindow) {
 TEST_P(WaylandWindowTest, CanDispatchEventToMenuWindowNonNested) {
   MockPlatformWindowDelegate menu_window_delegate;
   std::unique_ptr<WaylandWindow> menu_window = CreateWaylandWindowWithParams(
-      PlatformWindowType::PLATFORM_WINDOW_TYPE_MENU, widget_,
-      gfx::Rect(0, 0, 10, 10), &menu_window_delegate);
+      PlatformWindowType::kMenu, widget_, gfx::Rect(0, 0, 10, 10),
+      &menu_window_delegate);
 
   wl_seat_send_capabilities(server_.seat()->resource(),
                             WL_SEAT_CAPABILITY_POINTER);
@@ -539,15 +539,15 @@ TEST_P(WaylandWindowTest, CanDispatchEventToMenuWindowNested) {
       .WillOnce(SaveArg<0>(&menu_window_widget));
 
   std::unique_ptr<WaylandWindow> menu_window = CreateWaylandWindowWithParams(
-      PlatformWindowType::PLATFORM_WINDOW_TYPE_MENU, widget_,
-      gfx::Rect(0, 0, 10, 10), &menu_window_delegate);
+      PlatformWindowType::kMenu, widget_, gfx::Rect(0, 0, 10, 10),
+      &menu_window_delegate);
 
   Sync();
 
   MockPlatformWindowDelegate nested_menu_window_delegate;
   std::unique_ptr<WaylandWindow> nested_menu_window =
       CreateWaylandWindowWithParams(
-          PlatformWindowType::PLATFORM_WINDOW_TYPE_MENU, menu_window_widget,
+          PlatformWindowType::kMenu, menu_window_widget,
           gfx::Rect(20, 0, 10, 10), &nested_menu_window_delegate);
 
   Sync();

ui/platform_window/platform_window_init_properties.h

@@ -17,10 +17,10 @@
 
 namespace ui {
 
-enum PlatformWindowType {
-  PLATFORM_WINDOW_TYPE_WINDOW,
-  PLATFORM_WINDOW_TYPE_POPUP,
-  PLATFORM_WINDOW_TYPE_MENU,
+enum class PlatformWindowType {
+  kWindow,
+  kPopup,
+  kMenu,
 };
 
 // Initial properties which are passed to PlatformWindow to be initialized
@@ -32,7 +32,7 @@ struct PlatformWindowInitProperties {
   ~PlatformWindowInitProperties();
 
   // Tells desired PlatformWindow type. It can be popup, menu or anything else.
-  PlatformWindowType type = PlatformWindowType::PLATFORM_WINDOW_TYPE_WINDOW;
+  PlatformWindowType type = PlatformWindowType::kWindow;
   // Sets the desired initial bounds. Can be empty.
   gfx::Rect bounds;
   // Tells PlatformWindow which native widget its parent holds. It is usually

ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc

@@ -27,15 +27,15 @@ ui::PlatformWindowInitProperties ConvertWidgetInitParamsToInitProperties(
 
   switch (params.type) {
     case Widget::InitParams::TYPE_WINDOW:
-      properties.type = ui::PlatformWindowType::PLATFORM_WINDOW_TYPE_WINDOW;
+      properties.type = ui::PlatformWindowType::kWindow;
       break;
 
     case Widget::InitParams::TYPE_MENU:
-      properties.type = ui::PlatformWindowType::PLATFORM_WINDOW_TYPE_MENU;
+      properties.type = ui::PlatformWindowType::kMenu;
       break;
 
     default:
-      properties.type = ui::PlatformWindowType::PLATFORM_WINDOW_TYPE_POPUP;
+      properties.type = ui::PlatformWindowType::kPopup;
       break;
   }