| 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_window_tree_host_x11.h" | 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_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 920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 931 memset(&swa, 0, sizeof(swa)); | 931 memset(&swa, 0, sizeof(swa)); |
| 932 swa.background_pixmap = None; | 932 swa.background_pixmap = None; |
| 933 | 933 |
| 934 ::Atom window_type; | 934 ::Atom window_type; |
| 935 switch (params.type) { | 935 switch (params.type) { |
| 936 case Widget::InitParams::TYPE_MENU: | 936 case Widget::InitParams::TYPE_MENU: |
| 937 swa.override_redirect = True; | 937 swa.override_redirect = True; |
| 938 window_type = atom_cache_.GetAtom("_NET_WM_WINDOW_TYPE_MENU"); | 938 window_type = atom_cache_.GetAtom("_NET_WM_WINDOW_TYPE_MENU"); |
| 939 break; | 939 break; |
| 940 case Widget::InitParams::TYPE_TOOLTIP: | 940 case Widget::InitParams::TYPE_TOOLTIP: |
| 941 swa.override_redirect = True; |
| 941 window_type = atom_cache_.GetAtom("_NET_WM_WINDOW_TYPE_TOOLTIP"); | 942 window_type = atom_cache_.GetAtom("_NET_WM_WINDOW_TYPE_TOOLTIP"); |
| 942 break; | 943 break; |
| 943 case Widget::InitParams::TYPE_POPUP: | 944 case Widget::InitParams::TYPE_POPUP: |
| 944 swa.override_redirect = True; | 945 swa.override_redirect = True; |
| 945 window_type = atom_cache_.GetAtom("_NET_WM_WINDOW_TYPE_NOTIFICATION"); | 946 window_type = atom_cache_.GetAtom("_NET_WM_WINDOW_TYPE_NOTIFICATION"); |
| 946 break; | 947 break; |
| 947 case Widget::InitParams::TYPE_DRAG: | 948 case Widget::InitParams::TYPE_DRAG: |
| 948 swa.override_redirect = True; | 949 swa.override_redirect = True; |
| 949 window_type = atom_cache_.GetAtom("_NET_WM_WINDOW_TYPE_DND"); | 950 window_type = atom_cache_.GetAtom("_NET_WM_WINDOW_TYPE_DND"); |
| 950 break; | 951 break; |
| (...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1677 if (linux_ui) { | 1678 if (linux_ui) { |
| 1678 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); | 1679 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
| 1679 if (native_theme) | 1680 if (native_theme) |
| 1680 return native_theme; | 1681 return native_theme; |
| 1681 } | 1682 } |
| 1682 | 1683 |
| 1683 return ui::NativeTheme::instance(); | 1684 return ui::NativeTheme::instance(); |
| 1684 } | 1685 } |
| 1685 | 1686 |
| 1686 } // namespace views | 1687 } // namespace views |
| OLD | NEW |