Skip to content

Commit

Permalink
chromeos: Remove NativeCursorManagerAshMus
Browse files Browse the repository at this point in the history
It was only used with Config::MUS, which we don't support any more.

I left the base interface NativeCursorManagerAsh in case we need to
introduce a NativeCursorManagerMash later for Config::MASH.

Bug: 841941
Change-Id: Ia107cfbbcea0d52d2b2ada2f77c4017ab1bab8f7
Reviewed-on: https://chromium-review.googlesource.com/1080387
Commit-Queue: James Cook <jamescook@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563420}
  • Loading branch information
James Cook authored and Commit Bot committed May 31, 2018
1 parent 6bd83fb commit 329c2a2
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 284 deletions.
2 changes: 0 additions & 2 deletions ash/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1071,8 +1071,6 @@ component("ash") {
"wm/native_cursor_manager_ash.h",
"wm/native_cursor_manager_ash_classic.cc",
"wm/native_cursor_manager_ash_classic.h",
"wm/native_cursor_manager_ash_mus.cc",
"wm/native_cursor_manager_ash_mus.h",
"wm/non_client_frame_controller.cc",
"wm/non_client_frame_controller.h",
"wm/overlay_event_filter.cc",
Expand Down
8 changes: 3 additions & 5 deletions ash/shell.cc
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@
#include "ash/wm/lock_state_controller.h"
#include "ash/wm/mru_window_tracker.h"
#include "ash/wm/native_cursor_manager_ash_classic.h"
#include "ash/wm/native_cursor_manager_ash_mus.h"
#include "ash/wm/overlay_event_filter.h"
#include "ash/wm/overview/window_selector_controller.h"
#include "ash/wm/resize_shadow_controller.h"
Expand Down Expand Up @@ -1031,10 +1030,9 @@ void Shell::Init(ui::ContextFactory* context_factory,
native_cursor_manager_ = new NativeCursorManagerAshClassic;
cursor_manager_ = std::make_unique<CursorManager>(
base::WrapUnique(native_cursor_manager_));
} else if (config == Config::MUS) {
native_cursor_manager_ = new NativeCursorManagerAshMus;
cursor_manager_ = std::make_unique<CursorManager>(
base::WrapUnique(native_cursor_manager_));
} else {
// TODO(jamescook|estade): Cursor manager for Config::MASH. We might be able
// to use most of the classic version after we switch to ws2.
}

shell_delegate_->PreInit();
Expand Down
3 changes: 3 additions & 0 deletions ash/wm/native_cursor_manager_ash.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ namespace ash {
// Ash specific extensions to NativeCursorManager. This lets us switch whether
// we're using the native cursor, along with exposing additional data about how
// we're going to render cursors.
// TODO(jamescook): If we don't end up with a mash implementation of this
// interface then collapse it with NativeCursorManagerAshClassic, which is the
// only subclass.
class ASH_EXPORT NativeCursorManagerAsh : public ::wm::NativeCursorManager {
public:
~NativeCursorManagerAsh() override = default;
Expand Down
205 changes: 0 additions & 205 deletions ash/wm/native_cursor_manager_ash_mus.cc

This file was deleted.

72 changes: 0 additions & 72 deletions ash/wm/native_cursor_manager_ash_mus.h

This file was deleted.

0 comments on commit 329c2a2

Please sign in to comment.