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 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
648 path->addRect(SkRect::MakeXYWH(0, 0, bounds.width(), bounds.height())); | 648 path->addRect(SkRect::MakeXYWH(0, 0, bounds.width(), bounds.height())); |
649 } | 649 } |
650 } | 650 } |
651 | 651 |
652 bool DesktopWindowTreeHostWin::GetClientAreaInsets(gfx::Insets* insets) const { | 652 bool DesktopWindowTreeHostWin::GetClientAreaInsets(gfx::Insets* insets) const { |
653 return false; | 653 return false; |
654 } | 654 } |
655 | 655 |
656 void DesktopWindowTreeHostWin::GetMinMaxSize(gfx::Size* min_size, | 656 void DesktopWindowTreeHostWin::GetMinMaxSize(gfx::Size* min_size, |
657 gfx::Size* max_size) const { | 657 gfx::Size* max_size) const { |
658 *min_size = native_widget_delegate_->GetMinimumSize(); | 658 *min_size = |
659 *max_size = native_widget_delegate_->GetMaximumSize(); | 659 gfx::win::DIPToScreenSize(native_widget_delegate_->GetMinimumSize()); |
| 660 *max_size = |
| 661 gfx::win::DIPToScreenSize(native_widget_delegate_->GetMaximumSize()); |
660 } | 662 } |
661 | 663 |
662 gfx::Size DesktopWindowTreeHostWin::GetRootViewSize() const { | 664 gfx::Size DesktopWindowTreeHostWin::GetRootViewSize() const { |
663 return GetWidget()->GetRootView()->size(); | 665 return GetWidget()->GetRootView()->size(); |
664 } | 666 } |
665 | 667 |
666 void DesktopWindowTreeHostWin::ResetWindowControls() { | 668 void DesktopWindowTreeHostWin::ResetWindowControls() { |
667 GetWidget()->non_client_view()->ResetWindowControls(); | 669 GetWidget()->non_client_view()->ResetWindowControls(); |
668 } | 670 } |
669 | 671 |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
991 | 993 |
992 // static | 994 // static |
993 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( | 995 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( |
994 internal::NativeWidgetDelegate* native_widget_delegate, | 996 internal::NativeWidgetDelegate* native_widget_delegate, |
995 DesktopNativeWidgetAura* desktop_native_widget_aura) { | 997 DesktopNativeWidgetAura* desktop_native_widget_aura) { |
996 return new DesktopWindowTreeHostWin(native_widget_delegate, | 998 return new DesktopWindowTreeHostWin(native_widget_delegate, |
997 desktop_native_widget_aura); | 999 desktop_native_widget_aura); |
998 } | 1000 } |
999 | 1001 |
1000 } // namespace views | 1002 } // namespace views |
OLD | NEW |