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 "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.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 988 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
999 } | 999 } |
1000 | 1000 |
1001 bool DesktopNativeWidgetAura::HasHitTestMask() const { | 1001 bool DesktopNativeWidgetAura::HasHitTestMask() const { |
1002 return native_widget_delegate_->HasHitTestMask(); | 1002 return native_widget_delegate_->HasHitTestMask(); |
1003 } | 1003 } |
1004 | 1004 |
1005 void DesktopNativeWidgetAura::GetHitTestMask(gfx::Path* mask) const { | 1005 void DesktopNativeWidgetAura::GetHitTestMask(gfx::Path* mask) const { |
1006 native_widget_delegate_->GetHitTestMask(mask); | 1006 native_widget_delegate_->GetHitTestMask(mask); |
1007 } | 1007 } |
1008 | 1008 |
| 1009 void DesktopNativeWidgetAura::OnLinkDisambiguationPopupRequested( |
| 1010 const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap) { |
| 1011 } |
| 1012 |
1009 //////////////////////////////////////////////////////////////////////////////// | 1013 //////////////////////////////////////////////////////////////////////////////// |
1010 // DesktopNativeWidgetAura, ui::EventHandler implementation: | 1014 // DesktopNativeWidgetAura, ui::EventHandler implementation: |
1011 | 1015 |
1012 void DesktopNativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) { | 1016 void DesktopNativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) { |
1013 if (event->is_char()) { | 1017 if (event->is_char()) { |
1014 // If a ui::InputMethod object is attached to the root window, character | 1018 // If a ui::InputMethod object is attached to the root window, character |
1015 // events are handled inside the object and are not passed to this function. | 1019 // events are handled inside the object and are not passed to this function. |
1016 // If such object is not attached, character events might be sent (e.g. on | 1020 // If such object is not attached, character events might be sent (e.g. on |
1017 // Windows). In this case, we just skip these. | 1021 // Windows). In this case, we just skip these. |
1018 return; | 1022 return; |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1213 if (cursor_reference_count_ == 0) { | 1217 if (cursor_reference_count_ == 0) { |
1214 // We are the last DesktopNativeWidgetAura instance, and we are responsible | 1218 // We are the last DesktopNativeWidgetAura instance, and we are responsible |
1215 // for cleaning up |cursor_manager_|. | 1219 // for cleaning up |cursor_manager_|. |
1216 delete cursor_manager_; | 1220 delete cursor_manager_; |
1217 native_cursor_manager_ = NULL; | 1221 native_cursor_manager_ = NULL; |
1218 cursor_manager_ = NULL; | 1222 cursor_manager_ = NULL; |
1219 } | 1223 } |
1220 } | 1224 } |
1221 | 1225 |
1222 } // namespace views | 1226 } // namespace views |
OLD | NEW |