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 "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
(...skipping 1686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1697 // WebContentsViewAura since changes to the Window's bounds need to be | 1697 // WebContentsViewAura since changes to the Window's bounds need to be |
1698 // messaged to the renderer. WebContentsViewAura invokes SetSize() or | 1698 // messaged to the renderer. WebContentsViewAura invokes SetSize() or |
1699 // SetBounds() itself. No matter how we got here, any redundant calls are | 1699 // SetBounds() itself. No matter how we got here, any redundant calls are |
1700 // harmless. | 1700 // harmless. |
1701 SetSize(new_bounds.size()); | 1701 SetSize(new_bounds.size()); |
1702 | 1702 |
1703 if (GetInputMethod()) | 1703 if (GetInputMethod()) |
1704 GetInputMethod()->OnCaretBoundsChanged(this); | 1704 GetInputMethod()->OnCaretBoundsChanged(this); |
1705 } | 1705 } |
1706 | 1706 |
| 1707 ui::TextInputClient* RenderWidgetHostViewAura::GetFocusedTextInputClient() { |
| 1708 return GetTextInputClient(); |
| 1709 } |
| 1710 |
1707 gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) { | 1711 gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) { |
1708 if (mouse_locked_) | 1712 if (mouse_locked_) |
1709 return ui::kCursorNone; | 1713 return ui::kCursorNone; |
1710 return current_cursor_.GetNativeCursor(); | 1714 return current_cursor_.GetNativeCursor(); |
1711 } | 1715 } |
1712 | 1716 |
1713 int RenderWidgetHostViewAura::GetNonClientComponent( | 1717 int RenderWidgetHostViewAura::GetNonClientComponent( |
1714 const gfx::Point& point) const { | 1718 const gfx::Point& point) const { |
1715 return HTCLIENT; | 1719 return HTCLIENT; |
1716 } | 1720 } |
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2629 | 2633 |
2630 //////////////////////////////////////////////////////////////////////////////// | 2634 //////////////////////////////////////////////////////////////////////////////// |
2631 // RenderWidgetHostViewBase, public: | 2635 // RenderWidgetHostViewBase, public: |
2632 | 2636 |
2633 // static | 2637 // static |
2634 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2638 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
2635 GetScreenInfoForWindow(results, NULL); | 2639 GetScreenInfoForWindow(results, NULL); |
2636 } | 2640 } |
2637 | 2641 |
2638 } // namespace content | 2642 } // namespace content |
OLD | NEW |