| 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 602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 613 void DesktopWindowTreeHostX11::FrameTypeChanged() { | 613 void DesktopWindowTreeHostX11::FrameTypeChanged() { |
| 614 Widget::FrameType new_type = | 614 Widget::FrameType new_type = |
| 615 native_widget_delegate_->AsWidget()->frame_type(); | 615 native_widget_delegate_->AsWidget()->frame_type(); |
| 616 SetUseNativeFrame(new_type == Widget::FRAME_TYPE_FORCE_NATIVE); | 616 SetUseNativeFrame(new_type == Widget::FRAME_TYPE_FORCE_NATIVE); |
| 617 // Replace the frame and layout the contents. Even though we don't have a | 617 // Replace the frame and layout the contents. Even though we don't have a |
| 618 // swapable glass frame like on Windows, we still replace the frame because | 618 // swapable glass frame like on Windows, we still replace the frame because |
| 619 // the button assets don't update otherwise. | 619 // the button assets don't update otherwise. |
| 620 native_widget_delegate_->AsWidget()->non_client_view()->UpdateFrame(); | 620 native_widget_delegate_->AsWidget()->non_client_view()->UpdateFrame(); |
| 621 } | 621 } |
| 622 | 622 |
| 623 NonClientFrameView* DesktopWindowTreeHostX11::CreateNonClientFrameView() { | |
| 624 return NULL; | |
| 625 } | |
| 626 | |
| 627 void DesktopWindowTreeHostX11::SetFullscreen(bool fullscreen) { | 623 void DesktopWindowTreeHostX11::SetFullscreen(bool fullscreen) { |
| 628 if (is_fullscreen_ == fullscreen) | 624 if (is_fullscreen_ == fullscreen) |
| 629 return; | 625 return; |
| 630 is_fullscreen_ = fullscreen; | 626 is_fullscreen_ = fullscreen; |
| 631 SetWMSpecState(fullscreen, | 627 SetWMSpecState(fullscreen, |
| 632 atom_cache_.GetAtom("_NET_WM_STATE_FULLSCREEN"), | 628 atom_cache_.GetAtom("_NET_WM_STATE_FULLSCREEN"), |
| 633 None); | 629 None); |
| 634 // Try to guess the size we will have after the switch to/from fullscreen: | 630 // Try to guess the size we will have after the switch to/from fullscreen: |
| 635 // - (may) avoid transient states | 631 // - (may) avoid transient states |
| 636 // - works around Flash content which expects to have the size updated | 632 // - works around Flash content which expects to have the size updated |
| (...skipping 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1677 if (linux_ui) { | 1673 if (linux_ui) { |
| 1678 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); | 1674 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
| 1679 if (native_theme) | 1675 if (native_theme) |
| 1680 return native_theme; | 1676 return native_theme; |
| 1681 } | 1677 } |
| 1682 | 1678 |
| 1683 return ui::NativeTheme::instance(); | 1679 return ui::NativeTheme::instance(); |
| 1684 } | 1680 } |
| 1685 | 1681 |
| 1686 } // namespace views | 1682 } // namespace views |
| OLD | NEW |