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