| 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 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 | 594 |
| 595 void DesktopWindowTreeHostX11::SetVisibilityChangedAnimationsEnabled( | 595 void DesktopWindowTreeHostX11::SetVisibilityChangedAnimationsEnabled( |
| 596 bool value) { | 596 bool value) { |
| 597 // Much like the previous NativeWidgetGtk, we don't have anything to do here. | 597 // Much like the previous NativeWidgetGtk, we don't have anything to do here. |
| 598 } | 598 } |
| 599 | 599 |
| 600 bool DesktopWindowTreeHostX11::ShouldUseNativeFrame() { | 600 bool DesktopWindowTreeHostX11::ShouldUseNativeFrame() { |
| 601 return use_native_frame_; | 601 return use_native_frame_; |
| 602 } | 602 } |
| 603 | 603 |
| 604 void DesktopWindowTreeHostX11::FrameTypeChanged() { | 604 void DesktopWindowTreeHostX11::FrameTypeChanged(Widget::FrameType new_type) { |
| 605 SetUseNativeFrame(new_type == Widget::FRAME_TYPE_FORCE_NATIVE); |
| 605 // Replace the frame and layout the contents. Even though we don't have a | 606 // Replace the frame and layout the contents. Even though we don't have a |
| 606 // swapable glass frame like on Windows, we still replace the frame because | 607 // swapable glass frame like on Windows, we still replace the frame because |
| 607 // the button assets don't update otherwise. | 608 // the button assets don't update otherwise. |
| 608 native_widget_delegate_->AsWidget()->non_client_view()->UpdateFrame(); | 609 native_widget_delegate_->AsWidget()->non_client_view()->UpdateFrame(); |
| 609 } | 610 } |
| 610 | 611 |
| 611 NonClientFrameView* DesktopWindowTreeHostX11::CreateNonClientFrameView() { | 612 NonClientFrameView* DesktopWindowTreeHostX11::CreateNonClientFrameView() { |
| 612 return NULL; | 613 return NULL; |
| 613 } | 614 } |
| 614 | 615 |
| (...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1595 if (linux_ui) { | 1596 if (linux_ui) { |
| 1596 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); | 1597 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); |
| 1597 if (native_theme) | 1598 if (native_theme) |
| 1598 return native_theme; | 1599 return native_theme; |
| 1599 } | 1600 } |
| 1600 | 1601 |
| 1601 return ui::NativeTheme::instance(); | 1602 return ui::NativeTheme::instance(); |
| 1602 } | 1603 } |
| 1603 | 1604 |
| 1604 } // namespace views | 1605 } // namespace views |
| OLD | NEW |