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

Unified Diff: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

Issue 111043002: Cursor state should be global for desktop Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't copy set of root windows before iterating Created 7 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
index 353c3ec2c72530f6c4b96d4b5ccad2cf1ff39ffa..c258f84d0a780401469a0d166a335d027be70664 100644
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
@@ -151,6 +151,12 @@ void DesktopRootWindowHostWin::OnRootWindowCreated(
const Widget::InitParams& params) {
root_window_ = root;
+ // The cursor is not necessarily visible when the root window is created.
+ aura::client::CursorClient* cursor_client =
+ aura::client::GetCursorClient(root_window_->window());
+ if (cursor_client)
+ is_cursor_visible_ = cursor_client->IsCursorVisible();
+
root_window_->window()->SetProperty(kContentWindowForRootWindow,
content_window_);
root_window_->window()->SetProperty(kDesktopRootWindowHostKey, this);
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698