| 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/native_widget_aura.h" | 5 #include "ui/views/widget/native_widget_aura.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "third_party/skia/include/core/SkRegion.h" | 9 #include "third_party/skia/include/core/SkRegion.h" |
| 10 #include "ui/aura/client/activation_client.h" | 10 #include "ui/aura/client/activation_client.h" |
| (...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 //////////////////////////////////////////////////////////////////////////////// | 731 //////////////////////////////////////////////////////////////////////////////// |
| 732 // NativeWidgetAura, aura::WindowDelegate implementation: | 732 // NativeWidgetAura, aura::WindowDelegate implementation: |
| 733 | 733 |
| 734 gfx::Size NativeWidgetAura::GetMinimumSize() const { | 734 gfx::Size NativeWidgetAura::GetMinimumSize() const { |
| 735 return delegate_->GetMinimumSize(); | 735 return delegate_->GetMinimumSize(); |
| 736 } | 736 } |
| 737 | 737 |
| 738 void NativeWidgetAura::OnBoundsChanged(const gfx::Rect& old_bounds, | 738 void NativeWidgetAura::OnBoundsChanged(const gfx::Rect& old_bounds, |
| 739 const gfx::Rect& new_bounds) { | 739 const gfx::Rect& new_bounds) { |
| 740 if (old_bounds.origin() != new_bounds.origin()) | 740 if (old_bounds.origin() != new_bounds.origin()) |
| 741 GetWidget()->widget_delegate()->OnWidgetMove(); | 741 delegate_->OnNativeWidgetMove(); |
| 742 if (old_bounds.size() != new_bounds.size()) { | 742 if (old_bounds.size() != new_bounds.size()) { |
| 743 #if defined(ENABLE_DIP) | 743 #if defined(ENABLE_DIP) |
| 744 delegate_->OnNativeWidgetSizeChanged( | 744 delegate_->OnNativeWidgetSizeChanged( |
| 745 ConvertSizeFromMonitor(new_bounds.size())); | 745 ConvertSizeFromMonitor(new_bounds.size())); |
| 746 #else | 746 #else |
| 747 delegate_->OnNativeWidgetSizeChanged(new_bounds.size()); | 747 delegate_->OnNativeWidgetSizeChanged(new_bounds.size()); |
| 748 #endif | 748 #endif |
| 749 } | 749 } |
| 750 } | 750 } |
| 751 | 751 |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1085 } | 1085 } |
| 1086 } | 1086 } |
| 1087 | 1087 |
| 1088 // static | 1088 // static |
| 1089 bool NativeWidgetPrivate::IsMouseButtonDown() { | 1089 bool NativeWidgetPrivate::IsMouseButtonDown() { |
| 1090 return aura::Env::GetInstance()->is_mouse_button_down(); | 1090 return aura::Env::GetInstance()->is_mouse_button_down(); |
| 1091 } | 1091 } |
| 1092 | 1092 |
| 1093 } // namespace internal | 1093 } // namespace internal |
| 1094 } // namespace views | 1094 } // namespace views |
| OLD | NEW |