| Index: components/mus/public/cpp/lib/window.cc
|
| diff --git a/components/mus/public/cpp/lib/window.cc b/components/mus/public/cpp/lib/window.cc
|
| index 9d7feeb79a2b651e3c6db37a58dcb3741aca4e7c..21b64c75ebbd0ed03d51241de233648bdd6e712e 100644
|
| --- a/components/mus/public/cpp/lib/window.cc
|
| +++ b/components/mus/public/cpp/lib/window.cc
|
| @@ -298,13 +298,13 @@ void Window::Reorder(Window* relative, mojom::OrderDirection direction) {
|
| void Window::MoveToFront() {
|
| if (!parent_ || parent_->children_.back() == this)
|
| return;
|
| - Reorder(parent_->children_.back(), mojom::ORDER_DIRECTION_ABOVE);
|
| + Reorder(parent_->children_.back(), mojom::OrderDirection::ABOVE);
|
| }
|
|
|
| void Window::MoveToBack() {
|
| if (!parent_ || parent_->children_.front() == this)
|
| return;
|
| - Reorder(parent_->children_.front(), mojom::ORDER_DIRECTION_BELOW);
|
| + Reorder(parent_->children_.front(), mojom::OrderDirection::BELOW);
|
| }
|
|
|
| bool Window::Contains(Window* child) const {
|
| @@ -358,7 +358,7 @@ void Window::SetTextInputState(mojo::TextInputStatePtr state) {
|
|
|
| void Window::SetImeVisibility(bool visible, mojo::TextInputStatePtr state) {
|
| // SetImeVisibility() shouldn't be used if the window is not editable.
|
| - DCHECK(state.is_null() || state->type != mojo::TEXT_INPUT_TYPE_NONE);
|
| + DCHECK(state.is_null() || state->type != mojo::TextInputType::NONE);
|
| if (connection_)
|
| tree_client()->SetImeVisibility(id_, visible, std::move(state));
|
| }
|
| @@ -378,7 +378,7 @@ void Window::SetCanFocus(bool can_focus) {
|
| }
|
|
|
| void Window::Embed(mus::mojom::WindowTreeClientPtr client) {
|
| - Embed(std::move(client), mus::mojom::WindowTree::ACCESS_POLICY_DEFAULT,
|
| + Embed(std::move(client), mus::mojom::WindowTree::kAccessPolicyDefault,
|
| base::Bind(&EmptyEmbedCallback));
|
| }
|
|
|
| @@ -473,7 +473,7 @@ Window::Window(WindowTreeConnection* connection, Id id)
|
| input_event_handler_(nullptr),
|
| viewport_metrics_(CreateEmptyViewportMetrics()),
|
| visible_(false),
|
| - cursor_id_(mojom::CURSOR_NULL),
|
| + cursor_id_(mojom::Cursor::CURSOR_NULL),
|
| drawn_(false) {}
|
|
|
| WindowTreeClientImpl* Window::tree_client() {
|
| @@ -780,15 +780,15 @@ bool Window::ReorderImpl(Window* window,
|
| std::find(window->parent_->children_.begin(),
|
| window->parent_->children_.end(), relative) -
|
| window->parent_->children_.begin();
|
| - if ((direction == mojom::ORDER_DIRECTION_ABOVE && child_i == target_i + 1) ||
|
| - (direction == mojom::ORDER_DIRECTION_BELOW && child_i + 1 == target_i)) {
|
| + if ((direction == mojom::OrderDirection::ABOVE && child_i == target_i + 1) ||
|
| + (direction == mojom::OrderDirection::BELOW && child_i + 1 == target_i)) {
|
| return false;
|
| }
|
|
|
| if (notifier)
|
| notifier->NotifyWindowReordering();
|
|
|
| - const size_t dest_i = direction == mojom::ORDER_DIRECTION_ABOVE
|
| + const size_t dest_i = direction == mojom::OrderDirection::ABOVE
|
| ? (child_i < target_i ? target_i : target_i + 1)
|
| : (child_i < target_i ? target_i - 1 : target_i);
|
| window->parent_->children_.erase(window->parent_->children_.begin() +
|
|
|