Skip to content

Commit

Permalink
Remove ash_shell
Browse files Browse the repository at this point in the history
ash_shell (and ash_shell_with_content) were introduced for
quick-checking of ash behaviors, as it's fast to build. However,
it's not used by many people, and I've noticed that it's broken
in many ways.

I believe no one is using it actually, so I think it's the time
to remove it at all.

ash_ui_perftests, which depends on ash_shell_lib_with_content,
is also removed, as it was introduced for a purpose but isn't
used actually.

Bug: none
Test: build passes
Change-Id: I68d4de5b0172f51240a99e61facbe4f7ee606ed4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2307909
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Jun Mukai <mukai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790124}
  • Loading branch information
jmuk authored and Commit Bot committed Jul 20, 2020
1 parent d845f3e commit 5a70363
Show file tree
Hide file tree
Showing 43 changed files with 10 additions and 2,938 deletions.
1 change: 0 additions & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,6 @@ group("gn_all") {

if (is_chromeos) {
deps += [
"//ash:ash_shell_with_content",
"//ash:ash_unittests",
"//ash/app_list:app_list_demo",
"//ash/app_list:app_list_unittests",
Expand Down
170 changes: 2 additions & 168 deletions ash/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1686,125 +1686,6 @@ component("ash") {
}
}

static_library("ash_shell_lib") {
testonly = true
sources = [
"../ui/views/test/test_views_delegate_aura.cc",
"shell/bubble.cc",
"shell/example_app_list_client.cc",
"shell/example_app_list_client.h",
"shell/example_factory.h",
"shell/example_session_controller_client.cc",
"shell/example_session_controller_client.h",
"shell/lock_view.cc",
"shell/shell_delegate_impl.cc",
"shell/shell_delegate_impl.h",
"shell/shell_views_delegate.cc",
"shell/shell_views_delegate.h",
"shell/toplevel_window.cc",
"shell/toplevel_window.h",
"shell/widgets.cc",
"shell/window_type_launcher.cc",
"shell/window_type_launcher.h",
"shell/window_watcher.cc",
"shell/window_watcher.h",
"shell/window_watcher_shelf_item_delegate.cc",
"shell/window_watcher_shelf_item_delegate.h",
]

# Usage of content should be in ash_shell_lib_with_content.
assert_no_deps = [
"//ash/public/cpp/external_arc",
"//components/arc",
"//components/exo",
"//content/public/browser",
"//content/public/common",
]

deps = [
":ash",
":test_support",
"//ash/app_list",
"//ash/public/cpp",
"//base",
"//base:i18n",
"//components/user_manager",
"//skia",
"//ui/aura",
"//ui/base",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/message_center",
"//ui/views",
"//ui/views:test_support",
"//ui/views/examples:views_examples_lib",
"//ui/wm",
]
}

static_library("ash_shell_lib_with_content") {
testonly = true
sources = [
"shell/content/client/shell_browser_main_parts.cc",
"shell/content/client/shell_browser_main_parts.h",
"shell/content/client/shell_content_browser_client.cc",
"shell/content/client/shell_content_browser_client.h",
"shell/content/client/shell_main_delegate.cc",
"shell/content/client/shell_main_delegate.h",
"shell/content/client/shell_new_window_delegate.cc",
"shell/content/client/shell_new_window_delegate.h",
"shell/content/embedded_browser.cc",
"shell/content/embedded_browser.h",
]

deps = [
":test_support",
"//ash/public/cpp",
"//ash/shortcut_viewer",
"//base:i18n",
"//chrome:packed_resources",

# TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
"//chromeos/audio",
"//chromeos/constants",
"//chromeos/dbus/biod",
"//chromeos/dbus/power",
"//chromeos/dbus/shill",
"//chromeos/network",
"//chromeos/services/network_config",
"//chromeos/services/network_config/public/mojom",
"//chromeos/system",
"//components/discardable_memory/public/mojom",
"//components/services/font:lib",
"//components/services/font/public/mojom",
"//content",
"//content/shell:content_shell_lib",
"//device/bluetooth",
"//net",
"//services/device/public/mojom",
"//skia",
"//ui/aura",
"//ui/base",
"//ui/base/ime/chromeos",
"//ui/base/ime/init",
"//ui/chromeos/events",
"//ui/compositor",
"//ui/display",
"//ui/events/devices",
"//ui/message_center",
"//ui/views:test_support",
"//ui/views/controls/webview",
"//ui/views/examples:views_examples_with_content_lib",
"//ui/wm",
]
public_deps = [ ":ash_shell_lib" ]
data_deps = [
"//ash/resources:ash_test_resources_200_percent",
"//ash/resources:ash_test_resources_with_content_100_percent",
"//ash/strings:ash_test_strings",
]
}

action("dbus_service_files") {
sources = [
"dbus/org.chromium.DisplayService.conf",
Expand Down Expand Up @@ -2369,53 +2250,6 @@ test("ash_perftests") {
]
}

test("ash_ui_perftests") {
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]

sources = [
"perftests/overview_animations_preftest.cc",
"shell/content/test/ash_content_perf_test_launcher.cc",
"shell/content/test/ash_content_test.cc",
"shell/content/test/ash_content_test.h",
]

deps = [
":ash_shell_lib_with_content",
":test_support",
"//ash/public/cpp",
"//base/test:test_support",
"//cc/base",
"//chromeos/constants:constants",
"//content/shell:content_shell_app",
"//content/shell:content_shell_lib",
"//content/test:browsertest_support",
"//content/test:test_support",
"//mojo/core/embedder",
"//testing/gtest",
"//testing/perf",
"//ui/aura",
"//ui/base",
"//ui/base:test_support",
"//ui/compositor:test_support",
"//ui/events:test_support",
"//ui/gl:test_support",
]
}

executable("ash_shell_with_content") {
testonly = true
sources = [ "shell/content/shell_with_content_main.cc" ]

deps = [
":ash_shell_lib_with_content",
"//base",
"//components/user_manager",
"//content",
"//content/public/app",
"//device/bluetooth",
]
}

static_library("test_support") {
testonly = true
friend = [
Expand Down Expand Up @@ -2499,8 +2333,6 @@ static_library("test_support") {
"shelf/shelf_view_test_api.h",
"shelf/test/widget_animation_waiter.cc",
"shelf/test/widget_animation_waiter.h",
"shell/toplevel_window.cc",
"shell/toplevel_window.h",
"shell_test_api.cc",
"system/message_center/test_notifier_settings_controller.cc",
"system/message_center/test_notifier_settings_controller.h",
Expand All @@ -2527,6 +2359,8 @@ static_library("test_support") {
"test/ash_test_views_delegate.h",
"test/fake_android_intent_helper.cc",
"test/fake_android_intent_helper.h",
"test/toplevel_window.cc",
"test/toplevel_window.h",
"test/ui_controls_factory_ash.cc",
"test/ui_controls_factory_ash.h",
"test_media_client.cc",
Expand Down
98 changes: 0 additions & 98 deletions ash/perftests/overview_animations_preftest.cc

This file was deleted.

6 changes: 0 additions & 6 deletions ash/shell/DEPS

This file was deleted.

1 change: 0 additions & 1 deletion ash/shell/OWNERS

This file was deleted.

54 changes: 0 additions & 54 deletions ash/shell/bubble.cc

This file was deleted.

10 changes: 0 additions & 10 deletions ash/shell/content/client/DEPS

This file was deleted.

Loading

0 comments on commit 5a70363

Please sign in to comment.