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_change_observer.h" | 10 #include "ui/aura/client/activation_change_observer.h" |
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
846 } | 846 } |
847 | 847 |
848 void NativeWidgetAura::OnWindowDestroyed() { | 848 void NativeWidgetAura::OnWindowDestroyed() { |
849 window_ = NULL; | 849 window_ = NULL; |
850 tooltip_manager_.reset(); | 850 tooltip_manager_.reset(); |
851 delegate_->OnNativeWidgetDestroyed(); | 851 delegate_->OnNativeWidgetDestroyed(); |
852 if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) | 852 if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) |
853 delete this; | 853 delete this; |
854 } | 854 } |
855 | 855 |
856 void NativeWidgetAura::OnWindowVisibilityChanged(bool visible) { | 856 void NativeWidgetAura::OnWindowTargetVisibilityChanged(bool visible) { |
857 delegate_->OnNativeWidgetVisibilityChanged(visible); | 857 delegate_->OnNativeWidgetVisibilityChanged(visible); |
858 } | 858 } |
859 | 859 |
860 bool NativeWidgetAura::HasHitTestMask() const { | 860 bool NativeWidgetAura::HasHitTestMask() const { |
861 return delegate_->HasHitTestMask(); | 861 return delegate_->HasHitTestMask(); |
862 } | 862 } |
863 | 863 |
864 void NativeWidgetAura::GetHitTestMask(gfx::Path* mask) const { | 864 void NativeWidgetAura::GetHitTestMask(gfx::Path* mask) const { |
865 DCHECK(mask); | 865 DCHECK(mask); |
866 delegate_->GetHitTestMask(mask); | 866 delegate_->GetHitTestMask(mask); |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1046 return aura::Env::GetInstance()->is_mouse_button_down(); | 1046 return aura::Env::GetInstance()->is_mouse_button_down(); |
1047 } | 1047 } |
1048 | 1048 |
1049 // static | 1049 // static |
1050 bool NativeWidgetPrivate::IsTouchDown() { | 1050 bool NativeWidgetPrivate::IsTouchDown() { |
1051 return aura::Env::GetInstance()->is_touch_down(); | 1051 return aura::Env::GetInstance()->is_touch_down(); |
1052 } | 1052 } |
1053 | 1053 |
1054 } // namespace internal | 1054 } // namespace internal |
1055 } // namespace views | 1055 } // namespace views |
OLD | NEW |