| 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 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 | 825 |
| 826 bool NativeWidgetAura::HasHitTestMask() const { | 826 bool NativeWidgetAura::HasHitTestMask() const { |
| 827 return delegate_->HasHitTestMask(); | 827 return delegate_->HasHitTestMask(); |
| 828 } | 828 } |
| 829 | 829 |
| 830 void NativeWidgetAura::GetHitTestMask(gfx::Path* mask) const { | 830 void NativeWidgetAura::GetHitTestMask(gfx::Path* mask) const { |
| 831 DCHECK(mask); | 831 DCHECK(mask); |
| 832 delegate_->GetHitTestMask(mask); | 832 delegate_->GetHitTestMask(mask); |
| 833 } | 833 } |
| 834 | 834 |
| 835 scoped_refptr<ui::Texture> NativeWidgetAura::CopyTexture() { |
| 836 // The layer we create doesn't have an external texture, so this should never |
| 837 // get invoked. |
| 838 NOTREACHED(); |
| 839 return scoped_refptr<ui::Texture>(); |
| 840 } |
| 841 |
| 835 //////////////////////////////////////////////////////////////////////////////// | 842 //////////////////////////////////////////////////////////////////////////////// |
| 836 // NativeWidgetAura, ui::EventHandler implementation: | 843 // NativeWidgetAura, ui::EventHandler implementation: |
| 837 | 844 |
| 838 ui::EventResult NativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) { | 845 ui::EventResult NativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) { |
| 839 if (event->is_char()) { | 846 if (event->is_char()) { |
| 840 // If a ui::InputMethod object is attached to the root window, character | 847 // If a ui::InputMethod object is attached to the root window, character |
| 841 // events are handled inside the object and are not passed to this function. | 848 // events are handled inside the object and are not passed to this function. |
| 842 // If such object is not attached, character events might be sent (e.g. on | 849 // If such object is not attached, character events might be sent (e.g. on |
| 843 // Windows). In this case, we just skip these. | 850 // Windows). In this case, we just skip these. |
| 844 return ui::ER_UNHANDLED; | 851 return ui::ER_UNHANDLED; |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1059 return aura::Env::GetInstance()->is_mouse_button_down(); | 1066 return aura::Env::GetInstance()->is_mouse_button_down(); |
| 1060 } | 1067 } |
| 1061 | 1068 |
| 1062 // static | 1069 // static |
| 1063 bool NativeWidgetPrivate::IsTouchDown() { | 1070 bool NativeWidgetPrivate::IsTouchDown() { |
| 1064 return aura::Env::GetInstance()->is_touch_down(); | 1071 return aura::Env::GetInstance()->is_touch_down(); |
| 1065 } | 1072 } |
| 1066 | 1073 |
| 1067 } // namespace internal | 1074 } // namespace internal |
| 1068 } // namespace views | 1075 } // namespace views |
| OLD | NEW |