Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: content/browser/browser_plugin/browser_plugin_guest.cc

Issue 1914603002: Replace ViewHostMsg_TextInputState_Params with content::TextInputState. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing Comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/browser_plugin/browser_plugin_guest.h" 5 #include "content/browser/browser_plugin/browser_plugin_guest.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 18 matching lines...) Expand all
29 #include "content/browser/renderer_host/render_widget_host_view_base.h" 29 #include "content/browser/renderer_host/render_widget_host_view_base.h"
30 #include "content/browser/web_contents/web_contents_impl.h" 30 #include "content/browser/web_contents/web_contents_impl.h"
31 #include "content/browser/web_contents/web_contents_view_guest.h" 31 #include "content/browser/web_contents/web_contents_view_guest.h"
32 #include "content/common/browser_plugin/browser_plugin_constants.h" 32 #include "content/common/browser_plugin/browser_plugin_constants.h"
33 #include "content/common/browser_plugin/browser_plugin_messages.h" 33 #include "content/common/browser_plugin/browser_plugin_messages.h"
34 #include "content/common/content_constants_internal.h" 34 #include "content/common/content_constants_internal.h"
35 #include "content/common/drag_messages.h" 35 #include "content/common/drag_messages.h"
36 #include "content/common/host_shared_bitmap_manager.h" 36 #include "content/common/host_shared_bitmap_manager.h"
37 #include "content/common/input_messages.h" 37 #include "content/common/input_messages.h"
38 #include "content/common/site_isolation_policy.h" 38 #include "content/common/site_isolation_policy.h"
39 #include "content/common/text_input_state.h"
39 #include "content/common/view_messages.h" 40 #include "content/common/view_messages.h"
40 #include "content/public/browser/browser_context.h" 41 #include "content/public/browser/browser_context.h"
41 #include "content/public/browser/browser_plugin_guest_manager.h" 42 #include "content/public/browser/browser_plugin_guest_manager.h"
42 #include "content/public/browser/content_browser_client.h" 43 #include "content/public/browser/content_browser_client.h"
43 #include "content/public/browser/guest_host.h" 44 #include "content/public/browser/guest_host.h"
44 #include "content/public/browser/render_widget_host_view.h" 45 #include "content/public/browser/render_widget_host_view.h"
45 #include "content/public/browser/user_metrics.h" 46 #include "content/public/browser/user_metrics.h"
46 #include "content/public/browser/web_contents_observer.h" 47 #include "content/public/browser/web_contents_observer.h"
47 #include "content/public/common/browser_plugin_guest_mode.h" 48 #include "content/public/common/browser_plugin_guest_mode.h"
48 #include "content/public/common/drop_data.h" 49 #include "content/public/common/drop_data.h"
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after
972 void BrowserPluginGuest::OnShowWidget(int route_id, 973 void BrowserPluginGuest::OnShowWidget(int route_id,
973 const gfx::Rect& initial_rect) { 974 const gfx::Rect& initial_rect) {
974 GetWebContents()->ShowCreatedWidget(route_id, initial_rect); 975 GetWebContents()->ShowCreatedWidget(route_id, initial_rect);
975 } 976 }
976 977
977 void BrowserPluginGuest::OnTakeFocus(bool reverse) { 978 void BrowserPluginGuest::OnTakeFocus(bool reverse) {
978 SendMessageToEmbedder( 979 SendMessageToEmbedder(
979 new BrowserPluginMsg_AdvanceFocus(browser_plugin_instance_id(), reverse)); 980 new BrowserPluginMsg_AdvanceFocus(browser_plugin_instance_id(), reverse));
980 } 981 }
981 982
982 void BrowserPluginGuest::OnTextInputStateChanged( 983 void BrowserPluginGuest::OnTextInputStateChanged(const TextInputState& params) {
983 const ViewHostMsg_TextInputState_Params& params) {
984 // Save the state of text input so we can restore it on focus. 984 // Save the state of text input so we can restore it on focus.
985 last_text_input_state_.reset(new ViewHostMsg_TextInputState_Params(params)); 985 last_text_input_state_.reset(new TextInputState(params));
986 986
987 SendTextInputTypeChangedToView( 987 SendTextInputTypeChangedToView(
988 static_cast<RenderWidgetHostViewBase*>( 988 static_cast<RenderWidgetHostViewBase*>(
989 web_contents()->GetRenderWidgetHostView())); 989 web_contents()->GetRenderWidgetHostView()));
990 } 990 }
991 991
992 void BrowserPluginGuest::OnImeCancelComposition() { 992 void BrowserPluginGuest::OnImeCancelComposition() {
993 static_cast<RenderWidgetHostViewBase*>( 993 static_cast<RenderWidgetHostViewBase*>(
994 web_contents()->GetRenderWidgetHostView())->ImeCancelComposition(); 994 web_contents()->GetRenderWidgetHostView())->ImeCancelComposition();
995 } 995 }
996 996
997 #if defined(OS_MACOSX) || defined(USE_AURA) 997 #if defined(OS_MACOSX) || defined(USE_AURA)
998 void BrowserPluginGuest::OnImeCompositionRangeChanged( 998 void BrowserPluginGuest::OnImeCompositionRangeChanged(
999 const gfx::Range& range, 999 const gfx::Range& range,
1000 const std::vector<gfx::Rect>& character_bounds) { 1000 const std::vector<gfx::Rect>& character_bounds) {
1001 static_cast<RenderWidgetHostViewBase*>( 1001 static_cast<RenderWidgetHostViewBase*>(
1002 web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged( 1002 web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged(
1003 range, character_bounds); 1003 range, character_bounds);
1004 } 1004 }
1005 #endif 1005 #endif
1006 1006
1007 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) { 1007 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) {
1008 if (delegate_) 1008 if (delegate_)
1009 delegate_->SetContextMenuPosition(position); 1009 delegate_->SetContextMenuPosition(position);
1010 } 1010 }
1011 1011
1012 } // namespace content 1012 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698