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_win.h" | 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" |
6 | 6 |
7 #include "base/win/metro.h" | 7 #include "base/win/metro.h" |
8 #include "third_party/skia/include/core/SkPath.h" | 8 #include "third_party/skia/include/core/SkPath.h" |
9 #include "third_party/skia/include/core/SkRegion.h" | 9 #include "third_party/skia/include/core/SkRegion.h" |
10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
(...skipping 892 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
903 void DesktopWindowTreeHostWin::HandleWindowSizeChanged() { | 903 void DesktopWindowTreeHostWin::HandleWindowSizeChanged() { |
904 // A resize may not have occurred if the window size happened not to have | 904 // A resize may not have occurred if the window size happened not to have |
905 // changed (can occur on Windows 10 when snapping a window to the side of | 905 // changed (can occur on Windows 10 when snapping a window to the side of |
906 // the screen). In that case do a resize to the current size to reenable | 906 // the screen). In that case do a resize to the current size to reenable |
907 // swaps. | 907 // swaps. |
908 if (compositor()) | 908 if (compositor()) |
909 compositor()->SetScaleAndSize(compositor()->device_scale_factor(), | 909 compositor()->SetScaleAndSize(compositor()->device_scale_factor(), |
910 compositor()->size()); | 910 compositor()->size()); |
911 } | 911 } |
912 | 912 |
| 913 void DesktopWindowTreeHostWin::AddLog(const std::string& log_string) { |
| 914 GetInputMethod()->GetLogCollector()->AddLog(log_string); |
| 915 } |
| 916 |
913 //////////////////////////////////////////////////////////////////////////////// | 917 //////////////////////////////////////////////////////////////////////////////// |
914 // DesktopWindowTreeHostWin, private: | 918 // DesktopWindowTreeHostWin, private: |
915 | 919 |
916 Widget* DesktopWindowTreeHostWin::GetWidget() { | 920 Widget* DesktopWindowTreeHostWin::GetWidget() { |
917 return native_widget_delegate_->AsWidget(); | 921 return native_widget_delegate_->AsWidget(); |
918 } | 922 } |
919 | 923 |
920 const Widget* DesktopWindowTreeHostWin::GetWidget() const { | 924 const Widget* DesktopWindowTreeHostWin::GetWidget() const { |
921 return native_widget_delegate_->AsWidget(); | 925 return native_widget_delegate_->AsWidget(); |
922 } | 926 } |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
954 | 958 |
955 // static | 959 // static |
956 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( | 960 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( |
957 internal::NativeWidgetDelegate* native_widget_delegate, | 961 internal::NativeWidgetDelegate* native_widget_delegate, |
958 DesktopNativeWidgetAura* desktop_native_widget_aura) { | 962 DesktopNativeWidgetAura* desktop_native_widget_aura) { |
959 return new DesktopWindowTreeHostWin(native_widget_delegate, | 963 return new DesktopWindowTreeHostWin(native_widget_delegate, |
960 desktop_native_widget_aura); | 964 desktop_native_widget_aura); |
961 } | 965 } |
962 | 966 |
963 } // namespace views | 967 } // namespace views |
OLD | NEW |