Moves components/mus/example/wm to mash/wm

First of many. BUG=none TEST=none R=ben@chromium.org Review URL: https://codereview.chromium.org/1458623003 Cr-Commit-Position: refs/heads/master@{#360239}
Denger-Network · Nov 18, 2015 · b044635 · b044635
1 parent dc3d2f0
commit b044635
Show file tree

Hide file tree

Showing 34 changed files with 115 additions and 93 deletions.
diff --git a/.gn b/.gn
@@ -216,6 +216,7 @@ check_targets = [
 
   #"//jingle/*",
   "//mandoline/*",
+  "//mash/*",
 
   #"//media/*",  # Lots of errors.
   "mojo/*",

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -589,7 +589,7 @@ source_set("browser") {
       "//ui/views/mus:for_component",
     ]
     defines += [ "MOJO_SHELL_CLIENT" ]
-    data_deps += [ "//components/mus/example/wm:example_wm" ]
+    data_deps += [ "//mash/wm:example_wm" ]
   }
   if (ui_compositor_image_transport) {
     deps += [ "//ui/gl" ]

diff --git a/components/mus/example/BUILD.gn b/components/mus/example/BUILD.gn
@@ -22,7 +22,7 @@ group("example") {
     "//components/mus/example/mock_sysui",
     "//components/mus/example/views_examples",
     "//components/mus/example/window_type_launcher",
-    "//components/mus/example/wm",
+    "//mash/wm",
     "//mojo/runner",
   ]
 }
@@ -33,7 +33,7 @@ test("mustash_unittests") {
     "//base/test:run_all_unittests",
     "//base/test:test_config",
     "//base/test:test_support",
-    "//components/mus/example/wm:unittests",
+    "//mash/wm:unittests",
     "//mojo/platform_handle:platform_handle_impl",
   ]
 }
diff --git a/components/mus/example/DEPS b/components/mus/example/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+mash",
+]
diff --git a/components/mus/example/mock_sysui/BUILD.gn b/components/mus/example/mock_sysui/BUILD.gn
@@ -15,9 +15,9 @@ mojo_native_application("mock_sysui") {
 
   deps = [
     "//base",
-    "//components/mus/example/wm/public/interfaces",
     "//components/mus/public/cpp",
     "//components/mus/public/interfaces",
+    "//mash/wm/public/interfaces",
     "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//skia",

diff --git a/components/mus/example/mock_sysui/mock_sysui.cc b/components/mus/example/mock_sysui/mock_sysui.cc
@@ -4,8 +4,8 @@
 
 #include "components/mus/example/mock_sysui/mock_sysui.h"
 
-#include "components/mus/example/wm/public/interfaces/container.mojom.h"
 #include "components/mus/public/cpp/property_type_converters.h"
+#include "mash/wm/public/interfaces/container.mojom.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "ui/gfx/canvas.h"
@@ -25,9 +25,9 @@ class DesktopBackground : public views::WidgetDelegateView {
     params.delegate = new DesktopBackground;
 
     std::map<std::string, std::vector<uint8_t>> properties;
-    properties[ash::mojom::kWindowContainer_Property] =
+    properties[mash::wm::mojom::kWindowContainer_Property] =
         mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
-            ash::mojom::CONTAINER_USER_BACKGROUND);
+            mash::wm::mojom::CONTAINER_USER_BACKGROUND);
     mus::Window* window =
         views::WindowManagerConnection::Get()->NewWindow(properties);
     params.native_widget = new views::NativeWidgetMus(
@@ -60,9 +60,9 @@ class Shelf : public views::WidgetDelegateView {
     params.delegate = new Shelf;
 
     std::map<std::string, std::vector<uint8_t>> properties;
-    properties[ash::mojom::kWindowContainer_Property] =
+    properties[mash::wm::mojom::kWindowContainer_Property] =
         mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
-            ash::mojom::CONTAINER_USER_SHELF);
+            mash::wm::mojom::CONTAINER_USER_SHELF);
     mus::Window* window =
         views::WindowManagerConnection::Get()->NewWindow(properties);
     params.native_widget = new views::NativeWidgetMus(

diff --git a/mash/DEPS b/mash/DEPS
@@ -0,0 +1,14 @@
+include_rules = [
+  "+components/mus/common/types.h",
+  "+components/mus/common/util.h",
+  "+components/mus/public",
+  "+mojo/application",
+  "+mojo/common",
+  "+mojo/converters",
+  "+mojo/public",
+  "+mojo/services/network/public",
+  "+mojo/services/tracing/public",
+  "+third_party/mojo_services",
+  "+third_party/skia/include",
+  "+ui",
+]
diff --git a/mash/OWNERS b/mash/OWNERS
@@ -0,0 +1,4 @@
+ben@chromium.org
+erg@chromium.org
+msw@chromium.org
+sky@chromium.org
diff --git a/components/mus/example/wm/BUILD.gn → mash/wm/BUILD.gn b/components/mus/example/wm/BUILD.gn → mash/wm/BUILD.gn
@@ -40,10 +40,10 @@ source_set("example_wm_lib") {
 
   deps = [
     "//base",
-    "//components/mus/example/wm/public/interfaces",
     "//components/mus/common",
     "//components/mus/public/cpp",
     "//components/mus/public/interfaces",
+    "//mash/wm/public/interfaces",
     "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/converters/geometry",

diff --git a/...nents/mus/example/wm/background_layout.cc → mash/wm/background_layout.cc b/...nents/mus/example/wm/background_layout.cc → mash/wm/background_layout.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/wm/background_layout.h"
+#include "mash/wm/background_layout.h"
 
 #include "components/mus/public/cpp/window.h"
 

diff --git a/...onents/mus/example/wm/background_layout.h → mash/wm/background_layout.h b/...onents/mus/example/wm/background_layout.h → mash/wm/background_layout.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_MUS_EXAMPLE_WM_BACKGROUND_LAYOUT_H_
-#define COMPONENTS_MUS_EXAMPLE_WM_BACKGROUND_LAYOUT_H_
+#ifndef MASH_WM_BACKGROUND_LAYOUT_H_
+#define MASH_WM_BACKGROUND_LAYOUT_H_
 
 #include "base/macros.h"
-#include "components/mus/example/wm/layout_manager.h"
+#include "mash/wm/layout_manager.h"
 
 // Lays out the desktop background within background containers.
 class BackgroundLayout : public LayoutManager {
@@ -22,4 +22,4 @@ class BackgroundLayout : public LayoutManager {
   DISALLOW_COPY_AND_ASSIGN(BackgroundLayout);
 };
 
-#endif  // COMPONENTS_MUS_EXAMPLE_WM_BACKGROUND_LAYOUT_H_
+#endif  // MASH_WM_BACKGROUND_LAYOUT_H_
diff --git a/components/mus/example/wm/layout_manager.cc → mash/wm/layout_manager.cc b/components/mus/example/wm/layout_manager.cc → mash/wm/layout_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/wm/layout_manager.h"
+#include "mash/wm/layout_manager.h"
 
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"

diff --git a/components/mus/example/wm/layout_manager.h → mash/wm/layout_manager.h b/components/mus/example/wm/layout_manager.h → mash/wm/layout_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_MUS_EXAMPLE_WM_LAYOUT_MANAGER_H_
-#define COMPONENTS_MUS_EXAMPLE_WM_LAYOUT_MANAGER_H_
+#ifndef MASH_WM_LAYOUT_MANAGER_H_
+#define MASH_WM_LAYOUT_MANAGER_H_
 
 #include "base/macros.h"
 #include "components/mus/public/cpp/window_observer.h"
@@ -50,4 +50,4 @@ class LayoutManager : public mus::WindowObserver {
   DISALLOW_COPY_AND_ASSIGN(LayoutManager);
 };
 
-#endif  // COMPONENTS_MUS_EXAMPLE_WM_LAYOUT_MANAGER_H_
+#endif  // MASH_WM_LAYOUT_MANAGER_H_
diff --git a/components/mus/example/wm/main.cc → mash/wm/main.cc b/components/mus/example/wm/main.cc → mash/wm/main.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/wm/window_manager_application.h"
+#include "mash/wm/window_manager_application.h"
 #include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 

diff --git a/components/mus/example/wm/move_loop.cc → mash/wm/move_loop.cc b/components/mus/example/wm/move_loop.cc → mash/wm/move_loop.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/wm/move_loop.h"
+#include "mash/wm/move_loop.h"
 
 #include "base/auto_reset.h"
-#include "components/mus/example/wm/property_util.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/input_event_constants.mojom.h"
+#include "mash/wm/property_util.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect.h"
 

diff --git a/components/mus/example/wm/move_loop.h → mash/wm/move_loop.h b/components/mus/example/wm/move_loop.h → mash/wm/move_loop.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_MUS_EXAMPLE_WM_MOVE_LOOP_H_
-#define COMPONENTS_MUS_EXAMPLE_WM_MOVE_LOOP_H_
+#ifndef MASH_WM_MOVE_LOOP_H_
+#define MASH_WM_MOVE_LOOP_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -112,4 +112,4 @@ class MoveLoop : public mus::WindowObserver {
   DISALLOW_COPY_AND_ASSIGN(MoveLoop);
 };
 
-#endif  // COMPONENTS_MUS_EXAMPLE_WM_MOVE_LOOP_H_
+#endif  // MASH_WM_MOVE_LOOP_H_
diff --git a/...ents/mus/example/wm/move_loop_unittest.cc → mash/wm/move_loop_unittest.cc b/...ents/mus/example/wm/move_loop_unittest.cc → mash/wm/move_loop_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/wm/move_loop.h"
+#include "mash/wm/move_loop.h"
 
 #include "components/mus/public/cpp/tests/test_window.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"

diff --git a/...example/wm/non_client_frame_controller.cc → mash/wm/non_client_frame_controller.cc b/...example/wm/non_client_frame_controller.cc → mash/wm/non_client_frame_controller.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/wm/non_client_frame_controller.h"
+#include "mash/wm/non_client_frame_controller.h"
 
-#include "components/mus/example/wm/non_client_frame_view_impl.h"
-#include "components/mus/example/wm/property_util.h"
 #include "components/mus/public/cpp/window.h"
+#include "mash/wm/non_client_frame_view_impl.h"
+#include "mash/wm/property_util.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/widget/widget.h"
 

diff --git a/.../example/wm/non_client_frame_controller.h → mash/wm/non_client_frame_controller.h b/.../example/wm/non_client_frame_controller.h → mash/wm/non_client_frame_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_MUS_EXAMPLE_WM_NON_CLIENT_FRAME_CONTROLLER_H_
-#define COMPONENTS_MUS_EXAMPLE_WM_NON_CLIENT_FRAME_CONTROLLER_H_
+#ifndef MASH_WM_NON_CLIENT_FRAME_CONTROLLER_H_
+#define MASH_WM_NON_CLIENT_FRAME_CONTROLLER_H_
 
 #include "base/macros.h"
 #include "components/mus/public/cpp/window_observer.h"
@@ -50,4 +50,4 @@ class NonClientFrameController : public views::WidgetDelegateView,
   DISALLOW_COPY_AND_ASSIGN(NonClientFrameController);
 };
 
-#endif  // COMPONENTS_MUS_EXAMPLE_WM_NON_CLIENT_FRAME_CONTROLLER_H_
+#endif  // MASH_WM_NON_CLIENT_FRAME_CONTROLLER_H_
diff --git a/.../example/wm/non_client_frame_view_impl.cc → mash/wm/non_client_frame_view_impl.cc b/.../example/wm/non_client_frame_view_impl.cc → mash/wm/non_client_frame_view_impl.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/wm/non_client_frame_view_impl.h"
+#include "mash/wm/non_client_frame_view_impl.h"
 
-#include "components/mus/example/wm/move_loop.h"
 #include "components/mus/public/cpp/window.h"
+#include "mash/wm/move_loop.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/canvas.h"

diff --git a/...s/example/wm/non_client_frame_view_impl.h → mash/wm/non_client_frame_view_impl.h b/...s/example/wm/non_client_frame_view_impl.h → mash/wm/non_client_frame_view_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_MUS_EXAMPLE_WM_NON_CLIENT_FRAME_VIEW_IMPL_H_
-#define COMPONENTS_MUS_EXAMPLE_WM_NON_CLIENT_FRAME_VIEW_IMPL_H_
+#ifndef MASH_WM_NON_CLIENT_FRAME_VIEW_IMPL_H_
+#define MASH_WM_NON_CLIENT_FRAME_VIEW_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -46,4 +46,4 @@ class NonClientFrameViewImpl : public views::CustomFrameView,
   DISALLOW_COPY_AND_ASSIGN(NonClientFrameViewImpl);
 };
 
-#endif  // COMPONENTS_MUS_EXAMPLE_WM_NON_CLIENT_FRAME_VIEW_IMPL_H_
+#endif  // MASH_WM_NON_CLIENT_FRAME_VIEW_IMPL_H_
diff --git a/components/mus/example/wm/property_util.cc → mash/wm/property_util.cc b/components/mus/example/wm/property_util.cc → mash/wm/property_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/wm/property_util.h"
+#include "mash/wm/property_util.h"
 
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
@@ -12,7 +12,7 @@
 
 mus::mojom::ShowState GetWindowShowState(const mus::Window* window) {
   if (window->HasSharedProperty(
-      mus::mojom::WindowManager::kShowState_Property)) {
+          mus::mojom::WindowManager::kShowState_Property)) {
     return static_cast<mus::mojom::ShowState>(
         window->GetSharedProperty<int32_t>(
             mus::mojom::WindowManager::kShowState_Property));
@@ -32,7 +32,7 @@ void SetWindowUserSetBounds(mus::Window* window, const gfx::Rect& bounds) {
 
 gfx::Rect GetWindowUserSetBounds(const mus::Window* window) {
   if (window->HasSharedProperty(
-      mus::mojom::WindowManager::kUserSetBounds_Property)) {
+          mus::mojom::WindowManager::kUserSetBounds_Property)) {
     return window->GetSharedProperty<gfx::Rect>(
         mus::mojom::WindowManager::kUserSetBounds_Property);
   }
@@ -46,20 +46,20 @@ void SetWindowPreferredSize(mus::Window* window, const gfx::Size& size) {
 
 gfx::Size GetWindowPreferredSize(const mus::Window* window) {
   if (window->HasSharedProperty(
-      mus::mojom::WindowManager::kPreferredSize_Property)) {
+          mus::mojom::WindowManager::kPreferredSize_Property)) {
     return window->GetSharedProperty<gfx::Size>(
         mus::mojom::WindowManager::kPreferredSize_Property);
   }
   return gfx::Size();
 }
 
-ash::mojom::Container GetRequestedContainer(const mus::Window* window) {
-  if (window->HasSharedProperty(ash::mojom::kWindowContainer_Property)) {
-    return static_cast<ash::mojom::Container>(
+mash::wm::mojom::Container GetRequestedContainer(const mus::Window* window) {
+  if (window->HasSharedProperty(mash::wm::mojom::kWindowContainer_Property)) {
+    return static_cast<mash::wm::mojom::Container>(
         window->GetSharedProperty<int32_t>(
-            ash::mojom::kWindowContainer_Property));
+            mash::wm::mojom::kWindowContainer_Property));
   }
-  return ash::mojom::CONTAINER_USER_WINDOWS;
+  return mash::wm::mojom::CONTAINER_USER_WINDOWS;
 }
 
 mus::mojom::ResizeBehavior GetResizeBehavior(const mus::Window* window) {

diff --git a/components/mus/example/wm/property_util.h → mash/wm/property_util.h b/components/mus/example/wm/property_util.h → mash/wm/property_util.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_MUS_EXAMPLE_WM_PROPERTY_UTIL_H_
-#define COMPONENTS_MUS_EXAMPLE_WM_PROPERTY_UTIL_H_
+#ifndef MASH_WM_PROPERTY_UTIL_H_
+#define MASH_WM_PROPERTY_UTIL_H_
 
-#include "components/mus/example/wm/public/interfaces/container.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
+#include "mash/wm/public/interfaces/container.mojom.h"
 
 namespace gfx {
 class Rect;
@@ -29,11 +29,11 @@ gfx::Rect GetWindowUserSetBounds(const mus::Window* window);
 void SetWindowPreferredSize(mus::Window* window, const gfx::Size& size);
 gfx::Size GetWindowPreferredSize(const mus::Window* window);
 
-ash::mojom::Container GetRequestedContainer(const mus::Window* window);
+mash::wm::mojom::Container GetRequestedContainer(const mus::Window* window);
 
 mus::mojom::ResizeBehavior GetResizeBehavior(const mus::Window* window);
 
 void SetRestoreBounds(mus::Window* window, const gfx::Rect& bounds);
 gfx::Rect GetRestoreBounds(const mus::Window* window);
 
-#endif  // COMPONENTS_MUS_EXAMPLE_WM_PROPERTY_UTIL_H_
+#endif  // MASH_WM_PROPERTY_UTIL_H_
diff --git a/...mus/example/wm/public/interfaces/BUILD.gn → mash/wm/public/interfaces/BUILD.gn b/...mus/example/wm/public/interfaces/BUILD.gn → mash/wm/public/interfaces/BUILD.gn
diff --git a/...mple/wm/public/interfaces/container.mojom → mash/wm/public/interfaces/container.mojom b/...mple/wm/public/interfaces/container.mojom → mash/wm/public/interfaces/container.mojom
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-module ash.mojom;
+module mash.wm.mojom;
 
 enum Container {
   ALL_USER_BACKGROUND = 1,