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 996 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1007 xwindow_, | 1007 xwindow_, |
1008 atom_cache_.GetAtom("_NET_WM_WINDOW_TYPE"), | 1008 atom_cache_.GetAtom("_NET_WM_WINDOW_TYPE"), |
1009 XA_ATOM, | 1009 XA_ATOM, |
1010 32, | 1010 32, |
1011 PropModeReplace, | 1011 PropModeReplace, |
1012 reinterpret_cast<unsigned char*>(&window_type), 1); | 1012 reinterpret_cast<unsigned char*>(&window_type), 1); |
1013 | 1013 |
1014 // List of window state properties (_NET_WM_STATE) to set, if any. | 1014 // List of window state properties (_NET_WM_STATE) to set, if any. |
1015 std::vector< ::Atom> state_atom_list; | 1015 std::vector< ::Atom> state_atom_list; |
1016 | 1016 |
1017 // Remove popup windows from taskbar. | 1017 // Remove popup windows from taskbar unless overridden. |
1018 if (params.type == Widget::InitParams::TYPE_POPUP || | 1018 if ((params.type == Widget::InitParams::TYPE_POPUP || |
1019 params.type == Widget::InitParams::TYPE_BUBBLE) { | 1019 params.type == Widget::InitParams::TYPE_BUBBLE) && |
| 1020 !params.force_show_in_taskbar) { |
1020 state_atom_list.push_back( | 1021 state_atom_list.push_back( |
1021 atom_cache_.GetAtom("_NET_WM_STATE_SKIP_TASKBAR")); | 1022 atom_cache_.GetAtom("_NET_WM_STATE_SKIP_TASKBAR")); |
1022 } | 1023 } |
1023 | 1024 |
1024 // If the window should stay on top of other windows, add the | 1025 // If the window should stay on top of other windows, add the |
1025 // _NET_WM_STATE_ABOVE property. | 1026 // _NET_WM_STATE_ABOVE property. |
1026 is_always_on_top_ = params.keep_on_top; | 1027 is_always_on_top_ = params.keep_on_top; |
1027 if (is_always_on_top_) | 1028 if (is_always_on_top_) |
1028 state_atom_list.push_back(atom_cache_.GetAtom("_NET_WM_STATE_ABOVE")); | 1029 state_atom_list.push_back(atom_cache_.GetAtom("_NET_WM_STATE_ABOVE")); |
1029 | 1030 |
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1540 if (linux_ui) { | 1541 if (linux_ui) { |
1541 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); | 1542 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); |
1542 if (native_theme) | 1543 if (native_theme) |
1543 return native_theme; | 1544 return native_theme; |
1544 } | 1545 } |
1545 | 1546 |
1546 return ui::NativeTheme::instance(); | 1547 return ui::NativeTheme::instance(); |
1547 } | 1548 } |
1548 | 1549 |
1549 } // namespace views | 1550 } // namespace views |
OLD | NEW |