| Index: components/mus/ws/server_window.cc
|
| diff --git a/components/mus/ws/server_window.cc b/components/mus/ws/server_window.cc
|
| index 8a2c08653d099a5e48605ac0027621e229412d18..302c168417ddacc35acfa28c7bec604bc6f1924d 100644
|
| --- a/components/mus/ws/server_window.cc
|
| +++ b/components/mus/ws/server_window.cc
|
| @@ -30,7 +30,7 @@ ServerWindow::ServerWindow(ServerWindowDelegate* delegate,
|
| stacking_target_(nullptr),
|
| transient_parent_(nullptr),
|
| visible_(false),
|
| - cursor_id_(mojom::CURSOR_NULL),
|
| + cursor_id_(mojom::Cursor::CURSOR_NULL),
|
| opacity_(1),
|
| can_focus_(true),
|
| properties_(properties),
|
| @@ -88,7 +88,7 @@ void ServerWindow::Add(ServerWindow* child) {
|
| if (child->parent() == this) {
|
| if (children_.size() == 1)
|
| return; // Already in the right position.
|
| - child->Reorder(children_.back(), mojom::ORDER_DIRECTION_ABOVE);
|
| + child->Reorder(children_.back(), mojom::OrderDirection::ABOVE);
|
| return;
|
| }
|
|
|
| @@ -139,14 +139,14 @@ void ServerWindow::StackChildAtBottom(ServerWindow* child) {
|
| // There's nothing to do if the child is already at the bottom.
|
| if (children_.size() <= 1 || child == children_.front())
|
| return;
|
| - child->Reorder(children_.front(), mojom::ORDER_DIRECTION_BELOW);
|
| + child->Reorder(children_.front(), mojom::OrderDirection::BELOW);
|
| }
|
|
|
| void ServerWindow::StackChildAtTop(ServerWindow* child) {
|
| // There's nothing to do if the child is already at the top.
|
| if (children_.size() <= 1 || child == children_.back())
|
| return;
|
| - child->Reorder(children_.back(), mojom::ORDER_DIRECTION_ABOVE);
|
| + child->Reorder(children_.back(), mojom::OrderDirection::ABOVE);
|
| }
|
|
|
| void ServerWindow::SetBounds(const gfx::Rect& bounds) {
|
| @@ -409,10 +409,10 @@ void ServerWindow::ReorderImpl(ServerWindow* window,
|
| window));
|
| Windows::iterator i = std::find(window->parent_->children_.begin(),
|
| window->parent_->children_.end(), relative);
|
| - if (direction == mojom::ORDER_DIRECTION_ABOVE) {
|
| + if (direction == mojom::OrderDirection::ABOVE) {
|
| DCHECK(i != window->parent_->children_.end());
|
| window->parent_->children_.insert(++i, window);
|
| - } else if (direction == mojom::ORDER_DIRECTION_BELOW) {
|
| + } else if (direction == mojom::OrderDirection::BELOW) {
|
| DCHECK(i != window->parent_->children_.end());
|
| window->parent_->children_.insert(i, window);
|
| }
|
|
|