| 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 #include "ui/views/widget/desktop_aura/desktop_root_window_host_linux.h" | 5 #include "ui/views/widget/desktop_aura/desktop_root_window_host_linux.h" |
| 6 | 6 |
| 7 #include <X11/extensions/XInput2.h> | 7 #include <X11/extensions/XInput2.h> |
| 8 #include <X11/Xatom.h> | 8 #include <X11/Xatom.h> |
| 9 #include <X11/Xutil.h> | 9 #include <X11/Xutil.h> |
| 10 | 10 |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 Widget::InitParams sanitized_params = params; | 322 Widget::InitParams sanitized_params = params; |
| 323 if (sanitized_params.bounds.width() == 0) | 323 if (sanitized_params.bounds.width() == 0) |
| 324 sanitized_params.bounds.set_width(100); | 324 sanitized_params.bounds.set_width(100); |
| 325 if (sanitized_params.bounds.height() == 0) | 325 if (sanitized_params.bounds.height() == 0) |
| 326 sanitized_params.bounds.set_height(100); | 326 sanitized_params.bounds.set_height(100); |
| 327 | 327 |
| 328 InitX11Window(sanitized_params); | 328 InitX11Window(sanitized_params); |
| 329 return InitRootWindow(sanitized_params); | 329 return InitRootWindow(sanitized_params); |
| 330 } | 330 } |
| 331 | 331 |
| 332 void DesktopRootWindowHostLinux::InitFocus(aura::Window* window) { |
| 333 } |
| 334 |
| 332 void DesktopRootWindowHostLinux::Close() { | 335 void DesktopRootWindowHostLinux::Close() { |
| 333 // TODO(erg): Might need to do additional hiding tasks here. | 336 // TODO(erg): Might need to do additional hiding tasks here. |
| 334 | 337 |
| 335 if (!close_widget_factory_.HasWeakPtrs()) { | 338 if (!close_widget_factory_.HasWeakPtrs()) { |
| 336 // And we delay the close so that if we are called from an ATL callback, | 339 // And we delay the close so that if we are called from an ATL callback, |
| 337 // we don't destroy the window before the callback returned (as the caller | 340 // we don't destroy the window before the callback returned (as the caller |
| 338 // may delete ourselves on destroy and the ATL callback would still | 341 // may delete ourselves on destroy and the ATL callback would still |
| 339 // dereference us when the callback returns). | 342 // dereference us when the callback returns). |
| 340 MessageLoop::current()->PostTask( | 343 MessageLoop::current()->PostTask( |
| 341 FROM_HERE, | 344 FROM_HERE, |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1134 DesktopRootWindowHost* DesktopRootWindowHost::Create( | 1137 DesktopRootWindowHost* DesktopRootWindowHost::Create( |
| 1135 internal::NativeWidgetDelegate* native_widget_delegate, | 1138 internal::NativeWidgetDelegate* native_widget_delegate, |
| 1136 DesktopNativeWidgetAura* desktop_native_widget_aura, | 1139 DesktopNativeWidgetAura* desktop_native_widget_aura, |
| 1137 const gfx::Rect& initial_bounds) { | 1140 const gfx::Rect& initial_bounds) { |
| 1138 return new DesktopRootWindowHostLinux(native_widget_delegate, | 1141 return new DesktopRootWindowHostLinux(native_widget_delegate, |
| 1139 desktop_native_widget_aura, | 1142 desktop_native_widget_aura, |
| 1140 initial_bounds); | 1143 initial_bounds); |
| 1141 } | 1144 } |
| 1142 | 1145 |
| 1143 } // namespace views | 1146 } // namespace views |
| OLD | NEW |