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/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1033 | 1033 |
1034 void RenderWidgetHostViewAura::SetIsLoading(bool is_loading) { | 1034 void RenderWidgetHostViewAura::SetIsLoading(bool is_loading) { |
1035 if (is_loading_ && !is_loading && paint_observer_) | 1035 if (is_loading_ && !is_loading && paint_observer_) |
1036 paint_observer_->OnPageLoadComplete(); | 1036 paint_observer_->OnPageLoadComplete(); |
1037 is_loading_ = is_loading; | 1037 is_loading_ = is_loading; |
1038 UpdateCursorIfOverSelf(); | 1038 UpdateCursorIfOverSelf(); |
1039 } | 1039 } |
1040 | 1040 |
1041 void RenderWidgetHostViewAura::TextInputTypeChanged( | 1041 void RenderWidgetHostViewAura::TextInputTypeChanged( |
1042 ui::TextInputType type, | 1042 ui::TextInputType type, |
1043 bool can_compose_inline, | 1043 ui::TextInputMode input_mode, |
1044 ui::TextInputMode input_mode) { | 1044 bool can_compose_inline) { |
1045 if (text_input_type_ != type || | 1045 if (text_input_type_ != type || |
1046 can_compose_inline_ != can_compose_inline) { | 1046 can_compose_inline_ != can_compose_inline) { |
1047 text_input_type_ = type; | 1047 text_input_type_ = type; |
1048 can_compose_inline_ = can_compose_inline; | 1048 can_compose_inline_ = can_compose_inline; |
1049 if (GetInputMethod()) | 1049 if (GetInputMethod()) |
1050 GetInputMethod()->OnTextInputTypeChanged(this); | 1050 GetInputMethod()->OnTextInputTypeChanged(this); |
1051 if (touch_editing_client_) | 1051 if (touch_editing_client_) |
1052 touch_editing_client_->OnTextInputTypeChanged(text_input_type_); | 1052 touch_editing_client_->OnTextInputTypeChanged(text_input_type_); |
1053 } | 1053 } |
1054 } | 1054 } |
(...skipping 2204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3259 RenderWidgetHost* widget) { | 3259 RenderWidgetHost* widget) { |
3260 return new RenderWidgetHostViewAura(widget); | 3260 return new RenderWidgetHostViewAura(widget); |
3261 } | 3261 } |
3262 | 3262 |
3263 // static | 3263 // static |
3264 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3264 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
3265 GetScreenInfoForWindow(results, NULL); | 3265 GetScreenInfoForWindow(results, NULL); |
3266 } | 3266 } |
3267 | 3267 |
3268 } // namespace content | 3268 } // namespace content |
OLD | NEW |