| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//mojo/public/tools/bindings/mojom.gni") | 6 import("//mojo/public/tools/bindings/mojom.gni") |
| 7 import("//services/service_manager/public/cpp/service.gni") | 7 import("//services/service_manager/public/cpp/service.gni") |
| 8 import("//services/service_manager/public/service_manifest.gni") | 8 import("//services/service_manager/public/service_manifest.gni") |
| 9 import("//tools/grit/repack.gni") | 9 import("//tools/grit/repack.gni") |
| 10 | 10 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 "drag_window_resizer.h", | 44 "drag_window_resizer.h", |
| 45 "frame/custom_frame_view_mus.cc", | 45 "frame/custom_frame_view_mus.cc", |
| 46 "frame/custom_frame_view_mus.h", | 46 "frame/custom_frame_view_mus.h", |
| 47 "frame/detached_title_area_renderer.cc", | 47 "frame/detached_title_area_renderer.cc", |
| 48 "frame/detached_title_area_renderer.h", | 48 "frame/detached_title_area_renderer.h", |
| 49 "frame/detached_title_area_renderer_host.h", | 49 "frame/detached_title_area_renderer_host.h", |
| 50 "keyboard_ui_mus.cc", | 50 "keyboard_ui_mus.cc", |
| 51 "keyboard_ui_mus.h", | 51 "keyboard_ui_mus.h", |
| 52 "move_event_handler.cc", | 52 "move_event_handler.cc", |
| 53 "move_event_handler.h", | 53 "move_event_handler.h", |
| 54 "network_connect_delegate_mus.cc", |
| 55 "network_connect_delegate_mus.h", |
| 54 "non_client_frame_controller.cc", | 56 "non_client_frame_controller.cc", |
| 55 "non_client_frame_controller.h", | 57 "non_client_frame_controller.h", |
| 56 "property_util.cc", | 58 "property_util.cc", |
| 57 "property_util.h", | 59 "property_util.h", |
| 58 "root_window_controller.cc", | 60 "root_window_controller.cc", |
| 59 "root_window_controller.h", | 61 "root_window_controller.h", |
| 60 "screen_mus.cc", | 62 "screen_mus.cc", |
| 61 "screen_mus.h", | 63 "screen_mus.h", |
| 62 "shadow.cc", | 64 "shadow.cc", |
| 63 "shadow.h", | 65 "shadow.h", |
| 64 "shadow_controller.cc", | 66 "shadow_controller.cc", |
| 65 "shadow_controller.h", | 67 "shadow_controller.h", |
| 66 "shelf_delegate_mus.cc", | 68 "shelf_delegate_mus.cc", |
| 67 "shelf_delegate_mus.h", | 69 "shelf_delegate_mus.h", |
| 68 "shell_delegate_mus.cc", | 70 "shell_delegate_mus.cc", |
| 69 "shell_delegate_mus.h", | 71 "shell_delegate_mus.h", |
| 72 "system_tray_delegate_mus.cc", |
| 73 "system_tray_delegate_mus.h", |
| 70 "wallpaper_delegate_mus.cc", | 74 "wallpaper_delegate_mus.cc", |
| 71 "wallpaper_delegate_mus.h", | 75 "wallpaper_delegate_mus.h", |
| 72 "window_manager.cc", | 76 "window_manager.cc", |
| 73 "window_manager.h", | 77 "window_manager.h", |
| 74 "window_manager_application.cc", | 78 "window_manager_application.cc", |
| 75 "window_manager_application.h", | 79 "window_manager_application.h", |
| 76 "window_manager_observer.h", | 80 "window_manager_observer.h", |
| 77 "window_properties.cc", | 81 "window_properties.cc", |
| 78 "window_properties.h", | 82 "window_properties.h", |
| 79 ] | 83 ] |
| 80 | 84 |
| 81 defines = [ "NOTIMPLEMENTED_POLICY=5" ] | 85 defines = [ "NOTIMPLEMENTED_POLICY=5" ] |
| 82 | 86 |
| 83 deps = [ | 87 deps = [ |
| 88 "//chromeos", |
| 89 "//chromeos:power_manager_proto", |
| 84 "//components/user_manager", | 90 "//components/user_manager", |
| 85 "//components/wallpaper", | 91 "//components/wallpaper", |
| 86 "//content/public/common:service_names", | 92 "//content/public/common:service_names", |
| 93 "//device/bluetooth", |
| 87 "//ui/app_list/presenter", | 94 "//ui/app_list/presenter", |
| 88 "//ui/app_list/presenter:mojom", | 95 "//ui/app_list/presenter:mojom", |
| 96 "//ui/chromeos", |
| 89 "//ui/display/manager", | 97 "//ui/display/manager", |
| 90 "//ui/keyboard", | 98 "//ui/keyboard", |
| 91 "//ui/keyboard:mojom", | 99 "//ui/keyboard:mojom", |
| 92 "//ui/message_center", | 100 "//ui/message_center", |
| 93 ] | 101 ] |
| 94 | 102 |
| 95 public_deps = [ | 103 public_deps = [ |
| 96 "//ash", | 104 "//ash", |
| 97 "//ash/public/cpp", | 105 "//ash/public/cpp", |
| 98 "//ash/public/interfaces", | 106 "//ash/public/interfaces", |
| (...skipping 17 matching lines...) Expand all Loading... |
| 116 "//ui/resources", | 124 "//ui/resources", |
| 117 "//ui/strings", | 125 "//ui/strings", |
| 118 "//ui/views", | 126 "//ui/views", |
| 119 "//ui/views/mus:for_mojo_application", | 127 "//ui/views/mus:for_mojo_application", |
| 120 "//ui/wm", | 128 "//ui/wm", |
| 121 ] | 129 ] |
| 122 | 130 |
| 123 data_deps = [ | 131 data_deps = [ |
| 124 "//ash/touch_hud/mus:touch_hud", | 132 "//ash/touch_hud/mus:touch_hud", |
| 125 ] | 133 ] |
| 126 | |
| 127 if (is_chromeos) { | |
| 128 sources += [ | |
| 129 "network_connect_delegate_mus.cc", | |
| 130 "network_connect_delegate_mus.h", | |
| 131 "system_tray_delegate_mus.cc", | |
| 132 "system_tray_delegate_mus.h", | |
| 133 ] | |
| 134 | |
| 135 deps += [ | |
| 136 "//chromeos", | |
| 137 "//chromeos:power_manager_proto", | |
| 138 "//device/bluetooth", | |
| 139 "//ui/chromeos", | |
| 140 ] | |
| 141 } | |
| 142 } | 134 } |
| 143 | 135 |
| 144 service("mus") { | 136 service("mus") { |
| 145 output_name = "ash" | 137 output_name = "ash" |
| 146 | 138 |
| 147 sources = [ | 139 sources = [ |
| 148 "main.cc", | 140 "main.cc", |
| 149 ] | 141 ] |
| 150 | 142 |
| 151 deps = [ | 143 deps = [ |
| (...skipping 21 matching lines...) Expand all Loading... |
| 173 source = "manifest.json" | 165 source = "manifest.json" |
| 174 } | 166 } |
| 175 | 167 |
| 176 # TODO: Load locale-specific strings. | 168 # TODO: Load locale-specific strings. |
| 177 # TODO: Avoid duplication between Mash and Chrome pak files: crbug.com/628715. | 169 # TODO: Avoid duplication between Mash and Chrome pak files: crbug.com/628715. |
| 178 repack("resources") { | 170 repack("resources") { |
| 179 output = "$root_out_dir/ash_mus_resources.pak" | 171 output = "$root_out_dir/ash_mus_resources.pak" |
| 180 sources = [ | 172 sources = [ |
| 181 "$root_gen_dir/ash/common/strings/ash_strings_en-US.pak", | 173 "$root_gen_dir/ash/common/strings/ash_strings_en-US.pak", |
| 182 "$root_gen_dir/ash/resources/ash_resources_100_percent.pak", | 174 "$root_gen_dir/ash/resources/ash_resources_100_percent.pak", |
| 175 "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak", |
| 176 "$root_gen_dir/ui/chromeos/strings/ui_chromeos_strings_en-US.pak", |
| 183 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak", | 177 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak", |
| 184 "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", | 178 "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", |
| 185 "$root_gen_dir/ui/strings/ui_strings_en-US.pak", | 179 "$root_gen_dir/ui/strings/ui_strings_en-US.pak", |
| 186 "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak", | 180 "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak", |
| 187 ] | 181 ] |
| 188 deps = [ | 182 deps = [ |
| 189 "//ash/common/strings", | 183 "//ash/common/strings", |
| 190 "//ash/resources", | 184 "//ash/resources", |
| 185 "//ui/chromeos/resources", |
| 186 "//ui/chromeos/strings", |
| 191 "//ui/resources", | 187 "//ui/resources", |
| 192 "//ui/strings", | 188 "//ui/strings", |
| 193 "//ui/views/mus:resources", | 189 "//ui/views/mus:resources", |
| 194 "//ui/views/resources", | 190 "//ui/views/resources", |
| 195 ] | 191 ] |
| 196 | |
| 197 if (is_chromeos) { | |
| 198 sources += [ | |
| 199 "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak
", | |
| 200 "$root_gen_dir/ui/chromeos/strings/ui_chromeos_strings_en-US.pak", | |
| 201 ] | |
| 202 deps += [ | |
| 203 "//ui/chromeos/resources", | |
| 204 "//ui/chromeos/strings", | |
| 205 ] | |
| 206 } | |
| 207 } | 192 } |
| 208 | 193 |
| 209 repack("resources_200") { | 194 repack("resources_200") { |
| 210 output = "$root_out_dir/ash_mus_resources_200.pak" | 195 output = "$root_out_dir/ash_mus_resources_200.pak" |
| 211 sources = [ | 196 sources = [ |
| 212 "$root_gen_dir/ash/resources/ash_resources_200_percent.pak", | 197 "$root_gen_dir/ash/resources/ash_resources_200_percent.pak", |
| 198 "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_200_percent.pak", |
| 213 "$root_gen_dir/ui/resources/ui_resources_200_percent.pak", | 199 "$root_gen_dir/ui/resources/ui_resources_200_percent.pak", |
| 214 "$root_gen_dir/ui/views/resources/views_resources_200_percent.pak", | 200 "$root_gen_dir/ui/views/resources/views_resources_200_percent.pak", |
| 215 ] | 201 ] |
| 216 deps = [ | 202 deps = [ |
| 217 "//ash/resources", | 203 "//ash/resources", |
| 204 "//ui/chromeos/resources", |
| 218 "//ui/resources", | 205 "//ui/resources", |
| 219 "//ui/views/resources", | 206 "//ui/views/resources", |
| 220 ] | 207 ] |
| 221 | |
| 222 if (is_chromeos) { | |
| 223 sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_200_
percent.pak" ] | |
| 224 deps += [ "//ui/chromeos/resources" ] | |
| 225 } | |
| 226 } | 208 } |
| 227 | 209 |
| 228 source_set("unittests") { | 210 source_set("unittests") { |
| 229 testonly = true | 211 testonly = true |
| 230 | 212 |
| 231 sources = [ | 213 sources = [ |
| 232 "accelerators/accelerator_controller_registrar_test_api.cc", | 214 "accelerators/accelerator_controller_registrar_test_api.cc", |
| 233 "accelerators/accelerator_controller_registrar_test_api.h", | 215 "accelerators/accelerator_controller_registrar_test_api.h", |
| 234 "accelerators/accelerator_controller_unittest.cc", | 216 "accelerators/accelerator_controller_unittest.cc", |
| 235 "app_launch_unittest.cc", | 217 "app_launch_unittest.cc", |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 "//ui/views/mus", | 262 "//ui/views/mus", |
| 281 ] | 263 ] |
| 282 | 264 |
| 283 data_deps = [ | 265 data_deps = [ |
| 284 ":mus", | 266 ":mus", |
| 285 "//mash/quick_launch", | 267 "//mash/quick_launch", |
| 286 ] | 268 ] |
| 287 | 269 |
| 288 defines = [ "NOTIMPLEMENTED_POLICY=5" ] | 270 defines = [ "NOTIMPLEMENTED_POLICY=5" ] |
| 289 } | 271 } |
| OLD | NEW |