| 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_x11.h" | 5 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" |
| 6 | 6 |
| 7 #include <X11/extensions/shape.h> | 7 #include <X11/extensions/shape.h> |
| 8 #include <X11/extensions/XInput2.h> | 8 #include <X11/extensions/XInput2.h> |
| 9 #include <X11/Xatom.h> | 9 #include <X11/Xatom.h> |
| 10 #include <X11/Xregion.h> | 10 #include <X11/Xregion.h> |
| (...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 857 // SetWMSpecState) has no effect here since the window has not yet been | 857 // SetWMSpecState) has no effect here since the window has not yet been |
| 858 // mapped. So we manually change the state. | 858 // mapped. So we manually change the state. |
| 859 XChangeProperty (xdisplay_, | 859 XChangeProperty (xdisplay_, |
| 860 xwindow_, | 860 xwindow_, |
| 861 atom_cache_.GetAtom("_NET_WM_STATE"), | 861 atom_cache_.GetAtom("_NET_WM_STATE"), |
| 862 XA_ATOM, | 862 XA_ATOM, |
| 863 32, | 863 32, |
| 864 PropModeAppend, | 864 PropModeAppend, |
| 865 reinterpret_cast<unsigned char*>(&atom), 1); | 865 reinterpret_cast<unsigned char*>(&atom), 1); |
| 866 } | 866 } |
| 867 |
| 868 if (!params.wm_class_name.empty() || !params.wm_class_class.empty()) { |
| 869 ui::SetWindowClassHint( |
| 870 xdisplay_, xwindow_, params.wm_class_name, params.wm_class_class); |
| 871 } |
| 867 } | 872 } |
| 868 | 873 |
| 869 // TODO(erg): This method should basically be everything I need form | 874 // TODO(erg): This method should basically be everything I need form |
| 870 // RootWindowHostX11::RootWindowHostX11(). | 875 // RootWindowHostX11::RootWindowHostX11(). |
| 871 aura::RootWindow* DesktopRootWindowHostX11::InitRootWindow( | 876 aura::RootWindow* DesktopRootWindowHostX11::InitRootWindow( |
| 872 const Widget::InitParams& params) { | 877 const Widget::InitParams& params) { |
| 873 bounds_ = params.bounds; | 878 bounds_ = params.bounds; |
| 874 | 879 |
| 875 aura::RootWindow::CreateParams rw_params(bounds_); | 880 aura::RootWindow::CreateParams rw_params(bounds_); |
| 876 rw_params.host = this; | 881 rw_params.host = this; |
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1336 if (linux_ui) { | 1341 if (linux_ui) { |
| 1337 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); | 1342 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); |
| 1338 if (native_theme) | 1343 if (native_theme) |
| 1339 return native_theme; | 1344 return native_theme; |
| 1340 } | 1345 } |
| 1341 | 1346 |
| 1342 return ui::NativeTheme::instance(); | 1347 return ui::NativeTheme::instance(); |
| 1343 } | 1348 } |
| 1344 | 1349 |
| 1345 } // namespace views | 1350 } // namespace views |
| OLD | NEW |