Converts mash to use the common non-client frame

ash/mus/BUILD.gn

 # 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.
 
 import("//build/config/ui.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//services/shell/public/cpp/service.gni")
 import("//services/shell/public/service_manifest.gni")
 import("//tools/grit/repack.gni")
 
@@ skipping 20 matching lines @@
     "bridge/wm_shell_mus.cc",
     "bridge/wm_shell_mus.h",
     "bridge/wm_window_mus.cc",
     "bridge/wm_window_mus.h",
     "container_ids.cc",
     "container_ids.h",
     "disconnected_app_handler.cc",
     "disconnected_app_handler.h",
     "drag_window_resizer.cc",
     "drag_window_resizer.h",
-    "frame/caption_buttons/caption_button_types.h",

[James Cook, 2016/08/09 00:37:10]

Woo hoo! It's lovely to see this much code deletion.

-    "frame/caption_buttons/frame_caption_button.cc",
-    "frame/caption_buttons/frame_caption_button.h",
-    "frame/caption_buttons/frame_caption_button_container_view.cc",
-    "frame/caption_buttons/frame_caption_button_container_view.h",
-    "frame/default_header_painter.cc",
-    "frame/default_header_painter.h",
-    "frame/frame_border_hit_test_controller.cc",
-    "frame/frame_border_hit_test_controller.h",
-    "frame/header_painter.h",
-    "frame/header_painter_util.cc",
-    "frame/header_painter_util.h",
-    "frame/move_event_handler.cc",
-    "frame/move_event_handler.h",
-    "frame/non_client_frame_view_mash.cc",
-    "frame/non_client_frame_view_mash.h",
     "layout_manager.cc",
     "layout_manager.h",
+    "move_event_handler.cc",
+    "move_event_handler.h",
     "new_window_delegate_mus.cc",
     "new_window_delegate_mus.h",
     "non_client_frame_controller.cc",
     "non_client_frame_controller.h",
     "property_util.cc",
     "property_util.h",
     "root_window_controller.cc",
     "root_window_controller.h",
     "screenlock_layout.cc",
     "screenlock_layout.h",
@@ skipping 20 matching lines @@
   ]
 
   deps = [
     "//components/user_manager",
     "//ui/app_list/presenter",
     "//ui/message_center",
   ]
 
   public_deps = [
     "//ash",
-    "//ash/mus/resources",
     "//ash/public/interfaces",
     "//base",
     "//mash/session/public/interfaces",
     "//mojo/common:common_base",
     "//services/shell/public/cpp",
     "//services/tracing/public/cpp",
     "//services/ui/common:mus_common",
     "//services/ui/public/cpp",
     "//services/ui/public/interfaces",
     "//skia",
@@ skipping 44 matching lines @@
   name = "ash"
   source = "manifest.json"
 }
 
 # TODO: Load resources at additional scales and load locale-specific strings.
 # TODO: Avoid duplication between Mash and Chrome pak files: crbug.com/628715.
 repack("resources") {
   output = "$root_out_dir/ash_mus_resources.pak"
   sources = [
     "$root_gen_dir/ash/common/strings/ash_strings_en-US.pak",
-    "$root_gen_dir/ash/mus/resources/ash_mus_resources_100_percent.pak",
     "$root_gen_dir/ash/resources/ash_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
     "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
     "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak",
   ]
   deps = [
     "//ash/common/strings",
-    "//ash/mus/resources",
     "//ash/resources",
     "//ui/resources",
     "//ui/strings",
     "//ui/views/mus:resources",
     "//ui/views/resources",
   ]
 }
 
 source_set("unittests") {
   testonly = true
 
   sources = [
     "accelerators/accelerator_controller_registrar_test_api.cc",
     "accelerators/accelerator_controller_registrar_test_api.h",
     "accelerators/accelerator_controller_unittest.cc",
     "accelerators/accelerator_registrar_unittest.cc",
     "app_launch_unittest.cc",
     "bridge/wm_shell_mus_test_api.h",
+    "bridge/wm_window_mus_test_api.h",
     "layout_manager_unittest.cc",
     "root_window_controller_unittest.cc",
     "test/wm_test_base.cc",
     "test/wm_test_base.h",
     "test/wm_test_helper.cc",
     "test/wm_test_helper.h",
     "test/wm_test_screen.cc",
     "test/wm_test_screen.h",
     "window_manager_unittest.cc",
     "wm/mru_window_tracker_unittest.cc",
@@ skipping 28 matching lines @@
     "//ui/gfx/geometry/mojo",
     "//ui/message_center",
     "//ui/views/mus",
   ]
 
   data_deps = [
     ":mus",
     "//mash/quick_launch",
   ]
 }