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

Side by Side Diff: ui/views/mus/native_widget_mus.h

Issue 1991973003: mash: Preliminary support for widget hit test masks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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
« no previous file with comments | « components/mus/ws/window_tree.cc ('k') | ui/views/mus/native_widget_mus.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 5 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 ui::PlatformWindowDelegate* platform_window_delegate() { 231 ui::PlatformWindowDelegate* platform_window_delegate() {
232 return window_tree_host(); 232 return window_tree_host();
233 } 233 }
234 234
235 void set_last_cursor(mus::mojom::Cursor cursor) { last_cursor_ = cursor; } 235 void set_last_cursor(mus::mojom::Cursor cursor) { last_cursor_ = cursor; }
236 void SetShowState(mus::mojom::ShowState show_state); 236 void SetShowState(mus::mojom::ShowState show_state);
237 237
238 void OnMusWindowVisibilityChanging(mus::Window* window); 238 void OnMusWindowVisibilityChanging(mus::Window* window);
239 void OnMusWindowVisibilityChanged(mus::Window* window); 239 void OnMusWindowVisibilityChanged(mus::Window* window);
240 240
241 // Propagates the widget hit test mask, if any, to the mus::Window.
242 // TODO(jamescook): Wire this through views::Widget so widgets can push
243 // updates if needed.
244 void UpdateHitTestMask();
245
241 mus::Window* window_; 246 mus::Window* window_;
242 mus::mojom::Cursor last_cursor_; 247 mus::mojom::Cursor last_cursor_;
243 248
244 internal::NativeWidgetDelegate* native_widget_delegate_; 249 internal::NativeWidgetDelegate* native_widget_delegate_;
245 250
246 const mus::mojom::SurfaceType surface_type_; 251 const mus::mojom::SurfaceType surface_type_;
247 mus::mojom::ShowState show_state_before_fullscreen_; 252 mus::mojom::ShowState show_state_before_fullscreen_;
248 253
249 // See class documentation for Widget in widget.h for a note about ownership. 254 // See class documentation for Widget in widget.h for a note about ownership.
250 Widget::InitParams::Ownership ownership_; 255 Widget::InitParams::Ownership ownership_;
(...skipping 12 matching lines...) Expand all
263 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; 268 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
264 std::unique_ptr<wm::CursorManager> cursor_manager_; 269 std::unique_ptr<wm::CursorManager> cursor_manager_;
265 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; 270 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
266 271
267 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); 272 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
268 }; 273 };
269 274
270 } // namespace views 275 } // namespace views
271 276
272 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 277 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
OLDNEW
« no previous file with comments | « components/mus/ws/window_tree.cc ('k') | ui/views/mus/native_widget_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698