Commit fb0d03d4 authored by James Cook's avatar James Cook Committed by Commit Bot

chromeos: Remove some obsolete mash-related comments

The mash/mustash project was shut down over a year ago. Clean up some
obsolete comments and DEPS.

Bug: none
Change-Id: I9d9ce137a4cf42330eb104be7c9613a4c4ab0675
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210631Reviewed-by: default avatarMichael Wasserman <msw@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770842}
parent f3832d78
......@@ -1551,7 +1551,6 @@ TEST_F(AppListPresenterDelegateTest, SideShelfAlignmentDragDisabled) {
// Tests that the app list initializes in fullscreen with side shelf alignment
// and that the state transitions via text input act properly.
TEST_F(AppListPresenterDelegateTest, SideShelfAlignmentTextStateTransitions) {
// TODO(newcomer): Investigate mash failures crbug.com/726838
SetShelfAlignment(ShelfAlignment::kLeft);
// Open the app list with side shelf alignment, then check that it is in
......@@ -1578,7 +1577,6 @@ TEST_F(AppListPresenterDelegateTest, SideShelfAlignmentTextStateTransitions) {
// Tests that the app list initializes in peeking with bottom shelf alignment
// and that the state transitions via text input act properly.
TEST_F(AppListPresenterDelegateTest, BottomShelfAlignmentTextStateTransitions) {
// TODO(newcomer): Investigate mash failures crbug.com/726838
GetAppListTestHelper()->ShowAndRunLoop(GetPrimaryDisplayId());
AppListView* app_list = GetAppListView();
EXPECT_FALSE(app_list->is_fullscreen());
......@@ -1599,7 +1597,6 @@ TEST_F(AppListPresenterDelegateTest, BottomShelfAlignmentTextStateTransitions) {
// Tests that the app list initializes in fullscreen with tablet mode active
// and that the state transitions via text input act properly.
TEST_F(AppListPresenterDelegateTest, TabletModeTextStateTransitions) {
// TODO(newcomer): Investigate mash failures crbug.com/726838
EnableTabletMode(true);
GetAppListTestHelper()->ShowAndRunLoop(GetPrimaryDisplayId());
GetAppListTestHelper()->CheckState(AppListViewState::kFullscreenAllApps);
......@@ -1647,7 +1644,6 @@ TEST_F(AppListPresenterDelegateTest, AppListClosesWhenLeavingTabletMode) {
// Tests that the app list state responds correctly to tablet mode being
// enabled while the app list is being shown with half launcher.
TEST_F(AppListPresenterDelegateTest, HalfToFullscreenWhenTabletModeIsActive) {
// TODO(newcomer): Investigate mash failures crbug.com/726838
GetAppListTestHelper()->ShowAndRunLoop(GetPrimaryDisplayId());
GetAppListTestHelper()->CheckState(AppListViewState::kPeeking);
......@@ -1666,7 +1662,6 @@ TEST_F(AppListPresenterDelegateTest, HalfToFullscreenWhenTabletModeIsActive) {
// Tests that the app list view handles drag properly in laptop mode.
TEST_F(AppListPresenterDelegateTest, AppListViewDragHandler) {
// TODO(newcomer): Investigate mash failures crbug.com/726838
GetAppListTestHelper()->ShowAndRunLoop(GetPrimaryDisplayId());
GetAppListTestHelper()->CheckState(AppListViewState::kPeeking);
......@@ -2149,7 +2144,6 @@ TEST_F(AppListPresenterDelegateTest,
// Tests that the half app list closes itself if the user taps outside its
// bounds.
TEST_P(AppListPresenterDelegateTest, TapAndClickOutsideClosesHalfAppList) {
// TODO(newcomer): Investigate mash failures crbug.com/726838
GetAppListTestHelper()->ShowAndRunLoop(GetPrimaryDisplayId());
ui::test::EventGenerator* generator = GetEventGenerator();
......
......@@ -906,8 +906,6 @@ void RootWindowController::Init(RootWindowType root_window_type) {
shell->OnRootWindowAdded(root_window);
}
// TODO: TouchExplorationManager doesn't work with mash.
// http://crbug.com/679782
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAshDisableTouchExplorationMode)) {
touch_exploration_manager_ =
......
......@@ -55,7 +55,6 @@ class TouchExplorationManager;
class TouchHudDebug;
class TouchHudProjection;
class WallpaperWidgetController;
class WindowManager;
class WorkAreaInsets;
// This class maintains the per root window state for ash. This class
......@@ -94,8 +93,6 @@ class ASH_EXPORT RootWindowController {
: std::vector<RootWindowController*>();
}
// TODO(sky): move these to a separate class or use AshWindowTreeHost in
// mash. http://crbug.com/671246.
AshWindowTreeHost* ash_host() { return ash_host_.get(); }
const AshWindowTreeHost* ash_host() const { return ash_host_.get(); }
......@@ -232,14 +229,9 @@ class ASH_EXPORT RootWindowController {
FRIEND_TEST_ALL_PREFIXES(RootWindowControllerTest,
ContextMenuDisappearsInTabletMode);
// TODO(sky): remove this. Temporary during ash-mus unification.
// http://crbug.com/671246.
friend class WindowManager;
// Creates a new RootWindowController with the specified host. Only one of
// |ash_host| or |window_tree_host| should be specified. This takes ownership
// of the supplied arguments.
// TODO(sky): mash should create AshWindowTreeHost, http://crbug.com/671246.
RootWindowController(AshWindowTreeHost* ash_host,
aura::WindowTreeHost* window_tree_host);
......
......@@ -12,7 +12,6 @@ include_rules = [
"+cros",
"+dbus",
"+device/bluetooth",
"+mash/public/mojom",
"+media/audio/sounds", # For system sounds
"+media/base/media_switches.h", # For media command line switches.
"+media/mojo/mojom", # For platform verification mojom interface.
......
......@@ -8,8 +8,8 @@
#include <vector>
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h" // mash-ok
#include "ash/wm/window_util.h" // mash-ok
#include "ash/shell.h"
#include "ash/wm/window_util.h"
#include "chrome/browser/chromeos/input_method/assistive_window_properties.h"
#include "ui/base/ime/ime_bridge.h"
#include "ui/views/widget/widget.h"
......
......@@ -8,8 +8,8 @@
#include <vector>
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h" // mash-ok
#include "ash/wm/window_util.h" // mash-ok
#include "ash/shell.h"
#include "ash/wm/window_util.h"
#include "base/logging.h"
#include "ui/base/ime/ime_bridge.h"
#include "ui/chromeos/ime/infolist_window.h"
......
......@@ -5,7 +5,6 @@ include_rules = [
"+components/country_codes",
"+components/page_load_metrics/browser",
"+components/safety_check",
"+mash/public/mojom",
"+services/content/public",
"+services/device/public/mojom",
]
......
......@@ -14,7 +14,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_CHROMEOS)
#include "ash/shell.h" // mash-ok
#include "ash/shell.h"
#endif
#if defined(OS_MACOSX)
......
......@@ -7,18 +7,15 @@ include_rules = [
specific_include_rules = {
"chrome_views_delegate_chromeos\.cc": [
# TODO(mash): Fix. https://crbug.com/826456
"+ash/shell.h",
"+ash/wm/window_state.h",
],
"qrcode_generator\.*": [
"+chrome/services/qrcode_generator/public/cpp/qrcode_generator_service.h"
],
# mash-ok
"screen_capture_notification_ui_views\.cc": [
"+ash/shell.h",
],
# mash-ok
"status_bubble_views\.cc": [
"+ash/shell.h",
"+ash/wm/window_state.h",
......
......@@ -15,9 +15,9 @@
#include "ash/public/cpp/test/shell_test_api.h"
#include "ash/public/cpp/window_pin_type.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/shell.h" // mash-ok
#include "ash/wm/overview/overview_controller.h" // mash-ok
#include "ash/wm/tablet_mode/tablet_mode_controller.h" // mash-ok
#include "ash/shell.h"
#include "ash/wm/overview/overview_controller.h"
#include "ash/wm/tablet_mode/tablet_mode_controller.h"
#include "base/bind_helpers.h"
#include "base/run_loop.h"
#include "base/scoped_observer.h"
......
specific_include_rules = {
# mash-ok
"tab_drag_controller_interactive_uitest\.cc": [
"+ash/shell.h",
"+ash/wm/splitview/split_view_controller.h",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment