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

Side by Side Diff: ui/views/widget/desktop_aura/x11_desktop_handler.h

Issue 1045443002: Make File-Picker modal on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 5 years, 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_
7 7
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. 9 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
10 #undef RootWindow 10 #undef RootWindow
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 ::Window current_window_; 94 ::Window current_window_;
95 95
96 // Whether we should treat |current_window_| as active. In particular, we 96 // Whether we should treat |current_window_| as active. In particular, we
97 // pretend that a window is deactivated after a call to DeactivateWindow(). 97 // pretend that a window is deactivated after a call to DeactivateWindow().
98 ActiveState current_window_active_state_; 98 ActiveState current_window_active_state_;
99 99
100 ui::X11AtomCache atom_cache_; 100 ui::X11AtomCache atom_cache_;
101 101
102 bool wm_supports_active_window_; 102 bool wm_supports_active_window_;
103 103
104 XID modal_dialog_xid_;
105
104 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler); 106 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler);
105 }; 107 };
106 108
107 } // namespace views 109 } // namespace views
108 110
109 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ 111 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698