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 <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 #include "content/browser/renderer_host/render_view_host_delegate.h" | 40 #include "content/browser/renderer_host/render_view_host_delegate.h" |
41 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 41 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
42 #include "content/browser/renderer_host/render_view_host_impl.h" | 42 #include "content/browser/renderer_host/render_view_host_impl.h" |
43 #include "content/browser/renderer_host/render_widget_host_delegate.h" | 43 #include "content/browser/renderer_host/render_widget_host_delegate.h" |
44 #include "content/browser/renderer_host/render_widget_host_impl.h" | 44 #include "content/browser/renderer_host/render_widget_host_impl.h" |
45 #include "content/browser/renderer_host/render_widget_host_input_event_router.h" | 45 #include "content/browser/renderer_host/render_widget_host_input_event_router.h" |
46 #include "content/browser/renderer_host/ui_events_helper.h" | 46 #include "content/browser/renderer_host/ui_events_helper.h" |
47 #include "content/browser/renderer_host/web_input_event_aura.h" | 47 #include "content/browser/renderer_host/web_input_event_aura.h" |
48 #include "content/common/content_switches_internal.h" | 48 #include "content/common/content_switches_internal.h" |
49 #include "content/common/site_isolation_policy.h" | 49 #include "content/common/site_isolation_policy.h" |
| 50 #include "content/common/text_input_state.h" |
50 #include "content/common/view_messages.h" | 51 #include "content/common/view_messages.h" |
51 #include "content/public/browser/content_browser_client.h" | 52 #include "content/public/browser/content_browser_client.h" |
52 #include "content/public/browser/overscroll_configuration.h" | 53 #include "content/public/browser/overscroll_configuration.h" |
53 #include "content/public/browser/render_view_host.h" | 54 #include "content/public/browser/render_view_host.h" |
54 #include "content/public/browser/render_widget_host_view_frame_subscriber.h" | 55 #include "content/public/browser/render_widget_host_view_frame_subscriber.h" |
55 #include "content/public/browser/user_metrics.h" | 56 #include "content/public/browser/user_metrics.h" |
56 #include "content/public/common/content_switches.h" | 57 #include "content/public/common/content_switches.h" |
57 #include "gpu/ipc/common/gpu_messages.h" | 58 #include "gpu/ipc/common/gpu_messages.h" |
58 #include "third_party/WebKit/public/platform/WebScreenInfo.h" | 59 #include "third_party/WebKit/public/platform/WebScreenInfo.h" |
59 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" | 60 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" |
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
869 current_cursor_.SetDisplayInfo(display); | 870 current_cursor_.SetDisplayInfo(display); |
870 UpdateCursorIfOverSelf(); | 871 UpdateCursorIfOverSelf(); |
871 } | 872 } |
872 | 873 |
873 void RenderWidgetHostViewAura::SetIsLoading(bool is_loading) { | 874 void RenderWidgetHostViewAura::SetIsLoading(bool is_loading) { |
874 is_loading_ = is_loading; | 875 is_loading_ = is_loading; |
875 UpdateCursorIfOverSelf(); | 876 UpdateCursorIfOverSelf(); |
876 } | 877 } |
877 | 878 |
878 void RenderWidgetHostViewAura::TextInputStateChanged( | 879 void RenderWidgetHostViewAura::TextInputStateChanged( |
879 const ViewHostMsg_TextInputState_Params& params) { | 880 const TextInputState& params) { |
880 if (text_input_type_ != params.type || | 881 if (text_input_type_ != params.type || |
881 text_input_mode_ != params.mode || | 882 text_input_mode_ != params.mode || |
882 can_compose_inline_ != params.can_compose_inline || | 883 can_compose_inline_ != params.can_compose_inline || |
883 text_input_flags_ != params.flags) { | 884 text_input_flags_ != params.flags) { |
884 text_input_type_ = params.type; | 885 text_input_type_ = params.type; |
885 text_input_mode_ = params.mode; | 886 text_input_mode_ = params.mode; |
886 can_compose_inline_ = params.can_compose_inline; | 887 can_compose_inline_ = params.can_compose_inline; |
887 text_input_flags_ = params.flags; | 888 text_input_flags_ = params.flags; |
888 if (GetInputMethod()) | 889 if (GetInputMethod()) |
889 GetInputMethod()->OnTextInputTypeChanged(this); | 890 GetInputMethod()->OnTextInputTypeChanged(this); |
(...skipping 2063 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2953 | 2954 |
2954 //////////////////////////////////////////////////////////////////////////////// | 2955 //////////////////////////////////////////////////////////////////////////////// |
2955 // RenderWidgetHostViewBase, public: | 2956 // RenderWidgetHostViewBase, public: |
2956 | 2957 |
2957 // static | 2958 // static |
2958 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2959 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
2959 GetScreenInfoForWindow(results, NULL); | 2960 GetScreenInfoForWindow(results, NULL); |
2960 } | 2961 } |
2961 | 2962 |
2962 } // namespace content | 2963 } // namespace content |
OLD | NEW |