| OLD | NEW | 
|    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_DESKTOP_WINDOW_TREE_HOST_X11_H_ |    5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ | 
|    6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ |    6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ | 
|    7  |    7  | 
|    8 #include <stddef.h> |    8 #include <stddef.h> | 
|    9 #include <stdint.h> |    9 #include <stdint.h> | 
|   10 #include <X11/extensions/shape.h> |   10 #include <X11/extensions/shape.h> | 
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  253   ::Window xwindow_; |  253   ::Window xwindow_; | 
|  254  |  254  | 
|  255   // The native root window. |  255   // The native root window. | 
|  256   ::Window x_root_window_; |  256   ::Window x_root_window_; | 
|  257  |  257  | 
|  258   ui::X11AtomCache atom_cache_; |  258   ui::X11AtomCache atom_cache_; | 
|  259  |  259  | 
|  260   // Is the window mapped to the screen? |  260   // Is the window mapped to the screen? | 
|  261   bool window_mapped_; |  261   bool window_mapped_; | 
|  262  |  262  | 
 |  263   // Should we wait for an UnmapNotify before trying to remap the window? | 
 |  264   bool wait_for_unmap_; | 
 |  265  | 
|  263   // The bounds of |xwindow_|. |  266   // The bounds of |xwindow_|. | 
|  264   gfx::Rect bounds_in_pixels_; |  267   gfx::Rect bounds_in_pixels_; | 
|  265  |  268  | 
|  266   // Whenever the bounds are set, we keep the previous set of bounds around so |  269   // Whenever the bounds are set, we keep the previous set of bounds around so | 
|  267   // we can have a better chance of getting the real |  270   // we can have a better chance of getting the real | 
|  268   // |restored_bounds_in_pixels_|. Window managers tend to send a Configure |  271   // |restored_bounds_in_pixels_|. Window managers tend to send a Configure | 
|  269   // message with the maximized bounds, and then set the window maximized |  272   // message with the maximized bounds, and then set the window maximized | 
|  270   // property. (We don't rely on this for when we request that the window be |  273   // property. (We don't rely on this for when we request that the window be | 
|  271   // maximized, only when we detect that some other process has requested that |  274   // maximized, only when we detect that some other process has requested that | 
|  272   // we become the maximized window.) |  275   // we become the maximized window.) | 
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  350   base::CancelableCallback<void()> delayed_resize_task_; |  353   base::CancelableCallback<void()> delayed_resize_task_; | 
|  351  |  354  | 
|  352   base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_; |  355   base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_; | 
|  353  |  356  | 
|  354   DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11); |  357   DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11); | 
|  355 }; |  358 }; | 
|  356  |  359  | 
|  357 }  // namespace views |  360 }  // namespace views | 
|  358  |  361  | 
|  359 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ |  362 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ | 
| OLD | NEW |