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/strings/string_util.h" | 8 #include "base/strings/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 786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
797 | 797 |
798 bool NativeWidgetAura::HasHitTestMask() const { | 798 bool NativeWidgetAura::HasHitTestMask() const { |
799 return delegate_->HasHitTestMask(); | 799 return delegate_->HasHitTestMask(); |
800 } | 800 } |
801 | 801 |
802 void NativeWidgetAura::GetHitTestMask(gfx::Path* mask) const { | 802 void NativeWidgetAura::GetHitTestMask(gfx::Path* mask) const { |
803 DCHECK(mask); | 803 DCHECK(mask); |
804 delegate_->GetHitTestMask(mask); | 804 delegate_->GetHitTestMask(mask); |
805 } | 805 } |
806 | 806 |
807 scoped_refptr<ui::Texture> NativeWidgetAura::CopyTexture() { | 807 void NativeWidgetAura::DidRecreateLayer(ui::Layer *old_layer, |
808 // The layer we create doesn't have an external texture, so this should never | 808 ui::Layer *new_layer) { |
809 // get invoked. | |
810 NOTREACHED(); | |
811 return scoped_refptr<ui::Texture>(); | |
812 } | 809 } |
813 | 810 |
814 //////////////////////////////////////////////////////////////////////////////// | 811 //////////////////////////////////////////////////////////////////////////////// |
815 // NativeWidgetAura, ui::EventHandler implementation: | 812 // NativeWidgetAura, ui::EventHandler implementation: |
816 | 813 |
817 void NativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) { | 814 void NativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) { |
818 DCHECK(window_); | 815 DCHECK(window_); |
819 if (event->is_char()) { | 816 if (event->is_char()) { |
820 // If a ui::InputMethod object is attached to the root window, character | 817 // If a ui::InputMethod object is attached to the root window, character |
821 // events are handled inside the object and are not passed to this function. | 818 // events are handled inside the object and are not passed to this function. |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1128 return aura::Env::GetInstance()->is_mouse_button_down(); | 1125 return aura::Env::GetInstance()->is_mouse_button_down(); |
1129 } | 1126 } |
1130 | 1127 |
1131 // static | 1128 // static |
1132 bool NativeWidgetPrivate::IsTouchDown() { | 1129 bool NativeWidgetPrivate::IsTouchDown() { |
1133 return aura::Env::GetInstance()->is_touch_down(); | 1130 return aura::Env::GetInstance()->is_touch_down(); |
1134 } | 1131 } |
1135 | 1132 |
1136 } // namespace internal | 1133 } // namespace internal |
1137 } // namespace views | 1134 } // namespace views |
OLD | NEW |