Revert "window-service: moves most mojoms to ws namespace"

This reverts commit 2e7bbc1.

Reason for revert: Caused build failure

Original change's description:
> window-service: moves most mojoms to ws namespace
> 
> This also removes window_manager_constants as it was not used.
> 
> BUG=876924
> TEST=covered by tests
> TBR=msw@chromium.org,tsepez@chromium.org
> 
> Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
> Change-Id: I32224509d1f7264088333c674544559a8759729a
> Reviewed-on: https://chromium-review.googlesource.com/1188427
> Reviewed-by: Scott Violet <sky@chromium.org>
> Commit-Queue: Scott Violet <sky@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#585924}

TBR=sky@chromium.org,msw@chromium.org,tsepez@chromium.org

Change-Id: Id6a4f068bb134122a3557b1c93e3c70e37d1d382
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 876924
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/1188761
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585931}

ash/accelerators/accelerator_controller_unittest.cc

@@ -592,7 +592,7 @@ TEST_F(AcceleratorControllerTest, DontRepeatToggleFullscreen) {
   widget->Show();
   widget->Activate();
   widget->GetNativeView()->SetProperty(aura::client::kResizeBehaviorKey,
-                                       ws::mojom::kResizeBehaviorCanMaximize);
+                                       ui::mojom::kResizeBehaviorCanMaximize);
 
   ui::test::EventGenerator* generator = GetEventGenerator();
   wm::WindowState* window_state = wm::GetWindowState(widget->GetNativeView());

ash/accelerators/accelerator_unittest.cc

@@ -38,7 +38,7 @@ TEST_F(AcceleratorTest, PostAcceleratorWorks) {
   EXPECT_EQ(0, test_target.accelerator_count());
 
   EXPECT_TRUE(GetTestWindowTreeClient()->AckFirstEvent(
-      GetWindowTree(), ws::mojom::EventResult::UNHANDLED));
+      GetWindowTree(), ui::mojom::EventResult::UNHANDLED));
 
   // The client didn't handle the event, so |test_target| should get the
   // accelerator.

ash/app_launch_unittest.cc

@@ -45,8 +45,8 @@ TEST_F(AppLaunchTest, TestQuickLaunch) {
   connector()->StartService(mojom::kServiceName);
   connector()->StartService(quick_launch::mojom::kServiceName);
 
-  ws::mojom::WindowServerTestPtr test_interface;
-  connector()->BindInterface(ws::mojom::kServiceName, &test_interface);
+  ui::mojom::WindowServerTestPtr test_interface;
+  connector()->BindInterface(ui::mojom::kServiceName, &test_interface);
 
   base::RunLoop run_loop;
   bool success = false;

ash/app_list/views/search_result_answer_card_view.cc

@@ -63,7 +63,7 @@ CardData GetCardDataByToken(
     ui::ws2::ServerRemoteViewHost* view =
         new ui::ws2::ServerRemoteViewHost(window_service);
     view->EmbedUsingToken(token.value(),
-                          ws::mojom::kEmbedFlagEmbedderControlsVisibility,
+                          ui::mojom::kEmbedFlagEmbedderControlsVisibility,
                           base::DoNothing());
     return {view, view->embedding_root()};
   }

ash/ash_service.cc

@@ -128,7 +128,7 @@ void AshService::InitForMash() {
   base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
   thread_options.priority = base::ThreadPriority::NORMAL;
   CHECK(io_thread_->StartWithOptions(thread_options));
-  gpu_ = ui::Gpu::Create(context()->connector(), ws::mojom::kServiceName,
+  gpu_ = ui::Gpu::Create(context()->connector(), ui::mojom::kServiceName,
                          io_thread_->task_runner());
 
   context_factory_ = std::make_unique<ui::ws2::HostContextFactory>(
@@ -204,7 +204,7 @@ void AshService::CreateService(
     service_manager::mojom::ServiceRequest service,
     const std::string& name,
     service_manager::mojom::PIDReceiverPtr pid_receiver) {
-  DCHECK_EQ(name, ws::mojom::kServiceName);
+  DCHECK_EQ(name, ui::mojom::kServiceName);
   Shell::Get()->window_service_owner()->BindWindowService(std::move(service));
   if (base::FeatureList::IsEnabled(features::kMash)) {
     ui::ws2::WindowService* window_service =

ash/ash_service_unittest.cc

@@ -117,9 +117,9 @@ TEST_F(AshServiceTest, OpenWindow) {
   aura::test::EnvWindowTreeClientSetter env_window_tree_client_setter(
       client.get());
   std::map<std::string, std::vector<uint8_t>> properties;
-  properties[ws::mojom::WindowManager::kWindowType_InitProperty] =
+  properties[ui::mojom::WindowManager::kWindowType_InitProperty] =
       mojo::ConvertTo<std::vector<uint8_t>>(
-          static_cast<int32_t>(ws::mojom::WindowType::WINDOW));
+          static_cast<int32_t>(ui::mojom::WindowType::WINDOW));
   aura::WindowTreeHostMus window_tree_host_mus(
       aura::CreateInitParamsForTopLevel(client.get(), std::move(properties)));
   window_tree_host_mus.InitHost();
@@ -131,7 +131,7 @@ TEST_F(AshServiceTest, OpenWindow) {
 
   // Create another WindowTreeClient by way of embedding in
   // |child_window|. This blocks until it succeeds.
-  ws::mojom::WindowTreeClientPtr tree_client;
+  ui::mojom::WindowTreeClientPtr tree_client;
   auto tree_client_request = MakeRequest(&tree_client);
   client->Embed(child_window, std::move(tree_client), 0u,
                 base::BindOnce(&OnEmbed));

ash/components/tap_visualizer/tap_visualizer_app.cc

@@ -93,10 +93,10 @@ void TapVisualizerApp::CreateWidgetForDisplay(int64_t display_id) {
   params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
   params.accept_events = false;
   params.delegate = new views::WidgetDelegateView;
-  params.mus_properties[ws::mojom::WindowManager::kContainerId_InitProperty] =
+  params.mus_properties[ui::mojom::WindowManager::kContainerId_InitProperty] =
       mojo::ConvertTo<std::vector<uint8_t>>(
           static_cast<int32_t>(ash::kShellWindowId_OverlayContainer));
-  params.mus_properties[ws::mojom::WindowManager::kDisplayId_InitProperty] =
+  params.mus_properties[ui::mojom::WindowManager::kDisplayId_InitProperty] =
       mojo::ConvertTo<std::vector<uint8_t>>(display_id);
   params.show_state = ui::SHOW_STATE_FULLSCREEN;
   params.name = "TapVisualizer";

ash/content/content_gpu_interface_provider.cc

@@ -21,7 +21,7 @@ class ContentGpuInterfaceProvider::InterfaceBinderImpl
  public:
   InterfaceBinderImpl() = default;
 
-  void BindGpuRequestOnGpuTaskRunner(ws::mojom::GpuRequest request) {
+  void BindGpuRequestOnGpuTaskRunner(ui::mojom::GpuRequest request) {
     // The GPU task runner is bound to the IO thread.
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     auto gpu_client = content::CreateGpuClient(

ash/display/cursor_window_controller.cc

@@ -268,7 +268,7 @@ void CursorWindowController::SetContainer(aura::Window* container) {
     cursor_window_->SetTransparent(true);
     cursor_window_->Init(ui::LAYER_TEXTURED);
     cursor_window_->SetEventTargetingPolicy(
-        ws::mojom::EventTargetingPolicy::NONE);
+        ui::mojom::EventTargetingPolicy::NONE);
     cursor_window_->set_owned_by_parent(false);
     // Call UpdateCursorImage() to figure out |cursor_window_|'s desired size.
     UpdateCursorImage();

ash/frame/detached_title_area_renderer.cc

@@ -105,7 +105,7 @@ DetachedTitleAreaRendererForClient::DetachedTitleAreaRendererForClient(
   views::NativeWidgetAura* native_widget =
       new views::NativeWidgetAura(widget_, true, Shell::Get()->aura_env());
   aura::SetWindowType(native_widget->GetNativeWindow(),
-                      ws::mojom::WindowType::POPUP);
+                      ui::mojom::WindowType::POPUP);
   ApplyProperties(native_widget->GetNativeWindow(), property_converter,
                   *properties);
   native_widget->GetNativeView()->SetProperty(kDetachedTitleAreaRendererKey,

ash/frame/non_client_frame_view_ash_unittest.cc

@@ -445,7 +445,7 @@ TEST_F(NonClientFrameViewAshTest, MinimizedWindowsInTabletMode) {
   std::unique_ptr<views::Widget> widget =
       CreateTestWidget(new NonClientFrameViewAshTestWidgetDelegate);
   widget->GetNativeWindow()->SetProperty(aura::client::kResizeBehaviorKey,
-                                         ws::mojom::kResizeBehaviorCanMaximize);
+                                         ui::mojom::kResizeBehaviorCanMaximize);
   widget->Maximize();
   widget->Minimize();
   Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(true);
@@ -476,8 +476,8 @@ TEST_F(NonClientFrameViewAshTest, HeaderVisibilityInSplitview) {
     // Windows need to be resizable and maximizable to be used in splitview.
     widget->GetNativeWindow()->SetProperty(
         aura::client::kResizeBehaviorKey,
-        ws::mojom::kResizeBehaviorCanMaximize |
-            ws::mojom::kResizeBehaviorCanResize);
+        ui::mojom::kResizeBehaviorCanMaximize |
+            ui::mojom::kResizeBehaviorCanResize);
     return widget;
   };
 

ash/public/cpp/window_properties.cc

@@ -43,11 +43,11 @@ void RegisterWindowProperties(aura::PropertyConverter* property_converter) {
       kCaptionButtonBoundsKey, mojom::kCaptionButtonBounds_Property);
   property_converter->RegisterPrimitiveProperty(
       kFrameBackButtonStateKey,
-      ws::mojom::WindowManager::kFrameBackButtonState_Property,
+      ui::mojom::WindowManager::kFrameBackButtonState_Property,
       aura::PropertyConverter::CreateAcceptAnyValueCallback());
   property_converter->RegisterPrimitiveProperty(
       kFrameActiveColorKey,
-      ws::mojom::WindowManager::kFrameActiveColor_Property,
+      ui::mojom::WindowManager::kFrameActiveColor_Property,
       aura::PropertyConverter::CreateAcceptAnyValueCallback());
   property_converter->RegisterUnguessableTokenProperty(
       kFrameImageActiveKey, mojom::kFrameImageActive_Property);
@@ -66,7 +66,7 @@ void RegisterWindowProperties(aura::PropertyConverter* property_converter) {
       aura::PropertyConverter::CreateAcceptAnyValueCallback());
   property_converter->RegisterPrimitiveProperty(
       kFrameInactiveColorKey,
-      ws::mojom::WindowManager::kFrameInactiveColor_Property,
+      ui::mojom::WindowManager::kFrameInactiveColor_Property,
       aura::PropertyConverter::CreateAcceptAnyValueCallback());
   property_converter->RegisterPrimitiveProperty(
       kFrameIsThemedByHostedAppKey, mojom::kFrameIsThemedByHostedApp_Property,
@@ -88,14 +88,14 @@ void RegisterWindowProperties(aura::PropertyConverter* property_converter) {
       kIsShowingInOverviewKey, mojom::kIsShowingInOverview_Property,
       aura::PropertyConverter::CreateAcceptAnyValueCallback());
   property_converter->RegisterPrimitiveProperty(
-      kPanelAttachedKey, ws::mojom::WindowManager::kPanelAttached_Property,
+      kPanelAttachedKey, ui::mojom::WindowManager::kPanelAttached_Property,
       aura::PropertyConverter::CreateAcceptAnyValueCallback());
   property_converter->RegisterPrimitiveProperty(
       kRenderTitleAreaProperty,
-      ws::mojom::WindowManager::kRenderParentTitleArea_Property,
+      ui::mojom::WindowManager::kRenderParentTitleArea_Property,
       aura::PropertyConverter::CreateAcceptAnyValueCallback());
   property_converter->RegisterPrimitiveProperty(
-      kShelfItemTypeKey, ws::mojom::WindowManager::kShelfItemType_Property,
+      kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property,
       base::BindRepeating(&IsValidShelfItemType));
   property_converter->RegisterPrimitiveProperty(
       kWindowStateTypeKey, mojom::kWindowStateType_Property,
@@ -107,7 +107,7 @@ void RegisterWindowProperties(aura::PropertyConverter* property_converter) {
       kWindowPositionManagedTypeKey, mojom::kWindowPositionManaged_Property,
       aura::PropertyConverter::CreateAcceptAnyValueCallback());
   property_converter->RegisterStringProperty(
-      kShelfIDKey, ws::mojom::WindowManager::kShelfID_Property);
+      kShelfIDKey, ui::mojom::WindowManager::kShelfID_Property);
   property_converter->RegisterRectProperty(
       kRestoreBoundsOverrideKey, mojom::kRestoreBoundsOverride_Property);
   property_converter->RegisterPrimitiveProperty(
@@ -116,7 +116,7 @@ void RegisterWindowProperties(aura::PropertyConverter* property_converter) {
       base::BindRepeating(&IsValidWindowStateType));
   property_converter->RegisterPrimitiveProperty(
       aura::client::kTitleShownKey,
-      ws::mojom::WindowManager::kWindowTitleShown_Property,
+      ui::mojom::WindowManager::kWindowTitleShown_Property,
       aura::PropertyConverter::CreateAcceptAnyValueCallback());
 }
 

ash/public/cpp/window_properties.h

@@ -134,7 +134,7 @@ ASH_PUBLIC_EXPORT extern const aura::WindowProperty<bool>* const
 ASH_PUBLIC_EXPORT extern const aura::WindowProperty<bool>* const
     kPanelAttachedKey;
 
-// Maps to ws::mojom::WindowManager::kRenderParentTitleArea_Property.
+// Maps to ui::mojom::WindowManager::kRenderParentTitleArea_Property.
 ASH_PUBLIC_EXPORT extern const aura::WindowProperty<bool>* const
     kRenderTitleAreaProperty;
 

ash/shelf/shelf_layout_manager_unittest.cc

@@ -1530,8 +1530,8 @@ TEST_F(ShelfLayoutManagerNonHomeLauncherTest,
   std::unique_ptr<aura::Window> window(
       AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)));
   window->SetProperty(aura::client::kResizeBehaviorKey,
-                      ws::mojom::kResizeBehaviorCanResize |
-                          ws::mojom::kResizeBehaviorCanMaximize);
+                      ui::mojom::kResizeBehaviorCanResize |
+                          ui::mojom::kResizeBehaviorCanMaximize);
   wm::ActivateWindow(window.get());
 
   ui::test::EventGenerator* generator = GetEventGenerator();
@@ -2024,8 +2024,8 @@ TEST_F(ShelfLayoutManagerTest, ShelfBackgroundColorInSplitView) {
 
   std::unique_ptr<aura::Window> window1(CreateTestWindow());
   window1->SetProperty(aura::client::kResizeBehaviorKey,
-                       ws::mojom::kResizeBehaviorCanResize |
-                           ws::mojom::kResizeBehaviorCanMaximize);
+                       ui::mojom::kResizeBehaviorCanResize |
+                           ui::mojom::kResizeBehaviorCanMaximize);
   window1->Show();
 
   SplitViewController* split_view_controller =
@@ -2035,8 +2035,8 @@ TEST_F(ShelfLayoutManagerTest, ShelfBackgroundColorInSplitView) {
 
   std::unique_ptr<aura::Window> window2(CreateTestWindow());
   window2->SetProperty(aura::client::kResizeBehaviorKey,
-                       ws::mojom::kResizeBehaviorCanResize |
-                           ws::mojom::kResizeBehaviorCanMaximize);
+                       ui::mojom::kResizeBehaviorCanResize |
+                           ui::mojom::kResizeBehaviorCanMaximize);
   window2->Show();
   split_view_controller->SnapWindow(window2.get(), SplitViewController::RIGHT);
   EXPECT_EQ(SHELF_BACKGROUND_SPLIT_VIEW, GetShelfWidget()->GetBackgroundType());

ash/test/ash_test_base.cc

@@ -100,33 +100,33 @@ class AshEventGeneratorDelegate
   DISALLOW_COPY_AND_ASSIGN(AshEventGeneratorDelegate);
 };
 
-ws::mojom::WindowType MusWindowTypeFromWindowType(
+ui::mojom::WindowType MusWindowTypeFromWindowType(
     aura::client::WindowType window_type) {
   switch (window_type) {
     case aura::client::WINDOW_TYPE_UNKNOWN:
       break;
 
     case aura::client::WINDOW_TYPE_NORMAL:
-      return ws::mojom::WindowType::WINDOW;
+      return ui::mojom::WindowType::WINDOW;
 
     case aura::client::WINDOW_TYPE_POPUP:
-      return ws::mojom::WindowType::POPUP;
+      return ui::mojom::WindowType::POPUP;
 
     case aura::client::WINDOW_TYPE_CONTROL:
-      return ws::mojom::WindowType::CONTROL;
+      return ui::mojom::WindowType::CONTROL;
 
     case aura::client::WINDOW_TYPE_PANEL:
-      return ws::mojom::WindowType::PANEL;
+      return ui::mojom::WindowType::PANEL;
 
     case aura::client::WINDOW_TYPE_MENU:
-      return ws::mojom::WindowType::MENU;
+      return ui::mojom::WindowType::MENU;
 
     case aura::client::WINDOW_TYPE_TOOLTIP:
-      return ws::mojom::WindowType::TOOLTIP;
+      return ui::mojom::WindowType::TOOLTIP;
   }
 
   NOTREACHED();
-  return ws::mojom::WindowType::CONTROL;
+  return ui::mojom::WindowType::CONTROL;
 }
 
 }  // namespace
@@ -272,20 +272,20 @@ std::unique_ptr<aura::Window> AshTestBase::CreateTestWindow(
   // The following simulates what happens when a client creates a window.
   std::map<std::string, std::vector<uint8_t>> properties;
   if (!bounds_in_screen.IsEmpty()) {
-    properties[ws::mojom::WindowManager::kBounds_InitProperty] =
+    properties[ui::mojom::WindowManager::kBounds_InitProperty] =
         mojo::ConvertTo<std::vector<uint8_t>>(bounds_in_screen);
   }
 
-  properties[ws::mojom::WindowManager::kResizeBehavior_Property] =
+  properties[ui::mojom::WindowManager::kResizeBehavior_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
           static_cast<aura::PropertyConverter::PrimitiveType>(
-              ws::mojom::kResizeBehaviorCanResize |
-              ws::mojom::kResizeBehaviorCanMaximize |
-              ws::mojom::kResizeBehaviorCanMinimize));
+              ui::mojom::kResizeBehaviorCanResize |
+              ui::mojom::kResizeBehaviorCanMaximize |
+              ui::mojom::kResizeBehaviorCanMinimize));
 
-  const ws::mojom::WindowType mus_window_type =
+  const ui::mojom::WindowType mus_window_type =
       MusWindowTypeFromWindowType(type);
-  properties[ws::mojom::WindowManager::kWindowType_InitProperty] =
+  properties[ui::mojom::WindowManager::kWindowType_InitProperty] =
       mojo::ConvertTo<std::vector<uint8_t>>(
           static_cast<int32_t>(mus_window_type));
 
@@ -370,9 +370,9 @@ aura::Window* AshTestBase::CreateTestWindowInShellWithDelegateAndType(
     aura::client::ParentWindowWithContext(window, root, bounds);
   }
   window->SetProperty(aura::client::kResizeBehaviorKey,
-                      ws::mojom::kResizeBehaviorCanMaximize |
-                          ws::mojom::kResizeBehaviorCanMinimize |
-                          ws::mojom::kResizeBehaviorCanResize);
+                      ui::mojom::kResizeBehaviorCanMaximize |
+                          ui::mojom::kResizeBehaviorCanMinimize |
+                          ui::mojom::kResizeBehaviorCanResize);
   return window;
 }
 

ash/wm/ash_focus_rules_unittest.cc

@@ -138,9 +138,9 @@ class LockScreenAshFocusRulesTest : public AshTestBase {
     window->Init(ui::LAYER_TEXTURED);
     window->Show();
     window->SetProperty(aura::client::kResizeBehaviorKey,
-                        ws::mojom::kResizeBehaviorCanMaximize |
-                            ws::mojom::kResizeBehaviorCanMinimize |
-                            ws::mojom::kResizeBehaviorCanResize);
+                        ui::mojom::kResizeBehaviorCanMaximize |
+                            ui::mojom::kResizeBehaviorCanMinimize |
+                            ui::mojom::kResizeBehaviorCanResize);
     container->AddChild(window);
     return window;
   }

ash/wm/lock_layout_manager_unittest.cc

@@ -300,7 +300,7 @@ TEST_F(LockLayoutManagerTest, MultipleMonitors) {
   std::unique_ptr<aura::Window> window(
       CreateTestLoginWindow(widget_params, false /* use_delegate */));
   window->SetProperty(aura::client::kResizeBehaviorKey,
-                      ws::mojom::kResizeBehaviorCanMaximize);
+                      ui::mojom::kResizeBehaviorCanMaximize);
 
   EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString());
 
@@ -355,7 +355,7 @@ TEST_F(LockLayoutManagerTest, AccessibilityPanelWithMultipleMonitors) {
   std::unique_ptr<aura::Window> window(
       CreateTestLoginWindow(widget_params, false /* use_delegate */));
   window->SetProperty(aura::client::kResizeBehaviorKey,
-                      ws::mojom::kResizeBehaviorCanMaximize);
+                      ui::mojom::kResizeBehaviorCanMaximize);
 
   gfx::Rect target_bounds =
       display::Screen::GetScreen()->GetPrimaryDisplay().bounds();

ash/wm/non_client_frame_controller.cc

@@ -298,7 +298,7 @@ NonClientFrameController::NonClientFrameController(
     aura::Window* parent,
     aura::Window* context,
     const gfx::Rect& bounds,
-    ws::mojom::WindowType window_type,
+    ui::mojom::WindowType window_type,
     aura::PropertyConverter* property_converter,
     std::map<std::string, std::vector<uint8_t>>* properties)
     : widget_(new views::Widget), window_(nullptr) {
@@ -307,7 +307,7 @@ NonClientFrameController::NonClientFrameController(
   // underlying ui::Window. For example, showing the Widget shouldn't change
   // the bounds of the ui::Window in anyway.
   //
-  // Assertions around InitParams::Type matching ws::mojom::WindowType exist in
+  // Assertions around InitParams::Type matching ui::mojom::WindowType exist in
   // MusClient.
   views::Widget::InitParams params(
       static_cast<views::Widget::InitParams::Type>(window_type));
@@ -392,17 +392,17 @@ base::string16 NonClientFrameController::GetWindowTitle() const {
 
 bool NonClientFrameController::CanResize() const {
   return window_ && (window_->GetProperty(aura::client::kResizeBehaviorKey) &
-                     ws::mojom::kResizeBehaviorCanResize) != 0;
+                     ui::mojom::kResizeBehaviorCanResize) != 0;
 }
 
 bool NonClientFrameController::CanMaximize() const {
   return window_ && (window_->GetProperty(aura::client::kResizeBehaviorKey) &
-                     ws::mojom::kResizeBehaviorCanMaximize) != 0;
+                     ui::mojom::kResizeBehaviorCanMaximize) != 0;
 }
 
 bool NonClientFrameController::CanMinimize() const {
   return window_ && (window_->GetProperty(aura::client::kResizeBehaviorKey) &
-                     ws::mojom::kResizeBehaviorCanMinimize) != 0;
+                     ui::mojom::kResizeBehaviorCanMinimize) != 0;
 }
 
 bool NonClientFrameController::CanActivate() const {