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_native_widget_aura.h" | 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "ui/aura/client/activation_client.h" | 8 #include "ui/aura/client/activation_client.h" |
9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
10 #include "ui/aura/client/cursor_client.h" | 10 #include "ui/aura/client/cursor_client.h" |
(...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
772 } | 772 } |
773 | 773 |
774 bool DesktopNativeWidgetAura::HasHitTestMask() const { | 774 bool DesktopNativeWidgetAura::HasHitTestMask() const { |
775 return native_widget_delegate_->HasHitTestMask(); | 775 return native_widget_delegate_->HasHitTestMask(); |
776 } | 776 } |
777 | 777 |
778 void DesktopNativeWidgetAura::GetHitTestMask(gfx::Path* mask) const { | 778 void DesktopNativeWidgetAura::GetHitTestMask(gfx::Path* mask) const { |
779 native_widget_delegate_->GetHitTestMask(mask); | 779 native_widget_delegate_->GetHitTestMask(mask); |
780 } | 780 } |
781 | 781 |
782 scoped_refptr<ui::Texture> DesktopNativeWidgetAura::CopyTexture() { | 782 void DesktopNativeWidgetAura::DidRecreateLayer(ui::Layer* old_layer, |
783 // The layer we create doesn't have an external texture, so this should never | 783 ui::Layer* new_layer) {} |
784 // get invoked. | |
785 NOTREACHED(); | |
786 return scoped_refptr<ui::Texture>(); | |
787 } | |
788 | 784 |
789 //////////////////////////////////////////////////////////////////////////////// | 785 //////////////////////////////////////////////////////////////////////////////// |
790 // DesktopNativeWidgetAura, ui::EventHandler implementation: | 786 // DesktopNativeWidgetAura, ui::EventHandler implementation: |
791 | 787 |
792 void DesktopNativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) { | 788 void DesktopNativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) { |
793 if (event->is_char()) { | 789 if (event->is_char()) { |
794 // If a ui::InputMethod object is attached to the root window, character | 790 // If a ui::InputMethod object is attached to the root window, character |
795 // events are handled inside the object and are not passed to this function. | 791 // events are handled inside the object and are not passed to this function. |
796 // If such object is not attached, character events might be sent (e.g. on | 792 // If such object is not attached, character events might be sent (e.g. on |
797 // Windows). In this case, we just skip these. | 793 // Windows). In this case, we just skip these. |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
942 } | 938 } |
943 | 939 |
944 //////////////////////////////////////////////////////////////////////////////// | 940 //////////////////////////////////////////////////////////////////////////////// |
945 // DesktopNativeWidgetAura, NativeWidget implementation: | 941 // DesktopNativeWidgetAura, NativeWidget implementation: |
946 | 942 |
947 ui::EventHandler* DesktopNativeWidgetAura::GetEventHandler() { | 943 ui::EventHandler* DesktopNativeWidgetAura::GetEventHandler() { |
948 return this; | 944 return this; |
949 } | 945 } |
950 | 946 |
951 } // namespace views | 947 } // namespace views |
OLD | NEW |