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 958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
969 // DesktopNativeWidgetAura, aura::WindowDelegate implementation: | 969 // DesktopNativeWidgetAura, aura::WindowDelegate implementation: |
970 | 970 |
971 gfx::Size DesktopNativeWidgetAura::GetMinimumSize() const { | 971 gfx::Size DesktopNativeWidgetAura::GetMinimumSize() const { |
972 return native_widget_delegate_->GetMinimumSize(); | 972 return native_widget_delegate_->GetMinimumSize(); |
973 } | 973 } |
974 | 974 |
975 gfx::Size DesktopNativeWidgetAura::GetMaximumSize() const { | 975 gfx::Size DesktopNativeWidgetAura::GetMaximumSize() const { |
976 return native_widget_delegate_->GetMaximumSize(); | 976 return native_widget_delegate_->GetMaximumSize(); |
977 } | 977 } |
978 | 978 |
| 979 ui::TextInputClient* DesktopNativeWidgetAura::GetFocusedTextInputClient() { |
| 980 return GetWidget()->GetFocusedTextInputClient(); |
| 981 } |
| 982 |
979 gfx::NativeCursor DesktopNativeWidgetAura::GetCursor(const gfx::Point& point) { | 983 gfx::NativeCursor DesktopNativeWidgetAura::GetCursor(const gfx::Point& point) { |
980 return cursor_; | 984 return cursor_; |
981 } | 985 } |
982 | 986 |
983 int DesktopNativeWidgetAura::GetNonClientComponent( | 987 int DesktopNativeWidgetAura::GetNonClientComponent( |
984 const gfx::Point& point) const { | 988 const gfx::Point& point) const { |
985 return native_widget_delegate_->GetNonClientComponent(point); | 989 return native_widget_delegate_->GetNonClientComponent(point); |
986 } | 990 } |
987 | 991 |
988 bool DesktopNativeWidgetAura::ShouldDescendIntoChildForEventHandling( | 992 bool DesktopNativeWidgetAura::ShouldDescendIntoChildForEventHandling( |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1229 if (cursor_reference_count_ == 0) { | 1233 if (cursor_reference_count_ == 0) { |
1230 // We are the last DesktopNativeWidgetAura instance, and we are responsible | 1234 // We are the last DesktopNativeWidgetAura instance, and we are responsible |
1231 // for cleaning up |cursor_manager_|. | 1235 // for cleaning up |cursor_manager_|. |
1232 delete cursor_manager_; | 1236 delete cursor_manager_; |
1233 native_cursor_manager_ = NULL; | 1237 native_cursor_manager_ = NULL; |
1234 cursor_manager_ = NULL; | 1238 cursor_manager_ = NULL; |
1235 } | 1239 } |
1236 } | 1240 } |
1237 | 1241 |
1238 } // namespace views | 1242 } // namespace views |
OLD | NEW |