| 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_ROOT_WINDOW_HOST_X11_H_ | 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ |
| 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ | 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ |
| 7 | 7 |
| 8 #include <X11/extensions/shape.h> | 8 #include <X11/extensions/shape.h> |
| 9 #include <X11/Xlib.h> | 9 #include <X11/Xlib.h> |
| 10 | 10 |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 // Resets the window region for the current widget bounds if necessary. | 191 // Resets the window region for the current widget bounds if necessary. |
| 192 void ResetWindowRegion(); | 192 void ResetWindowRegion(); |
| 193 | 193 |
| 194 // Serializes an image to the format used by _NET_WM_ICON. | 194 // Serializes an image to the format used by _NET_WM_ICON. |
| 195 void SerializeImageRepresentation(const gfx::ImageSkiaRep& rep, | 195 void SerializeImageRepresentation(const gfx::ImageSkiaRep& rep, |
| 196 std::vector<unsigned long>* data); | 196 std::vector<unsigned long>* data); |
| 197 | 197 |
| 198 // See comment for variable open_windows_. | 198 // See comment for variable open_windows_. |
| 199 static std::list<XID>& open_windows(); | 199 static std::list<XID>& open_windows(); |
| 200 | 200 |
| 201 // Map the window (shows it) taking into account the given |show_state|. |
| 202 void MapWindow(ui::WindowShowState show_state); |
| 203 |
| 201 // Overridden from Dispatcher: | 204 // Overridden from Dispatcher: |
| 202 virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE; | 205 virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE; |
| 203 | 206 |
| 204 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_; | 207 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_; |
| 205 | 208 |
| 206 // X11 things | 209 // X11 things |
| 207 // The display and the native X window hosting the root window. | 210 // The display and the native X window hosting the root window. |
| 208 XDisplay* xdisplay_; | 211 XDisplay* xdisplay_; |
| 209 ::Window xwindow_; | 212 ::Window xwindow_; |
| 210 | 213 |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 scoped_ptr<X11ScopedCapture> x11_capture_; | 288 scoped_ptr<X11ScopedCapture> x11_capture_; |
| 286 | 289 |
| 287 base::string16 window_title_; | 290 base::string16 window_title_; |
| 288 | 291 |
| 289 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11); | 292 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11); |
| 290 }; | 293 }; |
| 291 | 294 |
| 292 } // namespace views | 295 } // namespace views |
| 293 | 296 |
| 294 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ | 297 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ |
| OLD | NEW |