Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Side by Side Diff: ui/views/mus/desktop_window_tree_host_mus.cc

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: OK, it can't be explicit for mac. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/mus/desktop_window_tree_host_mus.h" 5 #include "ui/views/mus/desktop_window_tree_host_mus.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 } 137 }
138 138
139 void SetVisibility(bool visible, 139 void SetVisibility(bool visible,
140 wm::NativeCursorManagerDelegate* delegate) override { 140 wm::NativeCursorManagerDelegate* delegate) override {
141 delegate->CommitVisibility(visible); 141 delegate->CommitVisibility(visible);
142 142
143 if (visible) { 143 if (visible) {
144 SetCursor(delegate->GetCursor(), delegate); 144 SetCursor(delegate->GetCursor(), delegate);
145 } else { 145 } else {
146 aura::WindowPortMus::Get(window_)->SetPredefinedCursor( 146 aura::WindowPortMus::Get(window_)->SetPredefinedCursor(
147 ui::mojom::CursorType::NONE); 147 ui::mojom::CursorType::kNone);
148 } 148 }
149 } 149 }
150 150
151 void SetCursorSet(ui::CursorSetType cursor_set, 151 void SetCursorSet(ui::CursorSetType cursor_set,
152 wm::NativeCursorManagerDelegate* delegate) override { 152 wm::NativeCursorManagerDelegate* delegate) override {
153 // TODO(erg): For now, ignore the difference between SET_NORMAL and 153 // TODO(erg): For now, ignore the difference between SET_NORMAL and
154 // SET_LARGE here. This feels like a thing that mus should decide instead. 154 // SET_LARGE here. This feels like a thing that mus should decide instead.
155 // 155 //
156 // Also, it's NOTIMPLEMENTED() in the desktop version!? Including not 156 // Also, it's NOTIMPLEMENTED() in the desktop version!? Including not
157 // acknowledging the call in the delegate. 157 // acknowledging the call in the delegate.
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 } 796 }
797 const gfx::Rect old_bounds_in_pixels = GetBoundsInPixels(); 797 const gfx::Rect old_bounds_in_pixels = GetBoundsInPixels();
798 WindowTreeHostMus::SetBoundsInPixels(final_bounds_in_pixels); 798 WindowTreeHostMus::SetBoundsInPixels(final_bounds_in_pixels);
799 if (old_bounds_in_pixels.size() != final_bounds_in_pixels.size()) { 799 if (old_bounds_in_pixels.size() != final_bounds_in_pixels.size()) {
800 SendClientAreaToServer(); 800 SendClientAreaToServer();
801 SendHitTestMaskToServer(); 801 SendHitTestMaskToServer();
802 } 802 }
803 } 803 }
804 804
805 } // namespace views 805 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/native/native_view_host_aura_unittest.cc ('k') | ui/views/native_cursor_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698