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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 2752113005: Let ImeAdapterAndroid have the same lifecycle as its Java peer (Closed)
Patch Set: background rwhva Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 48a67128acc7ba105122f11dabe1f1a5553532fd..0cae8e5b4b244f2f5df8fb037ecf66dfa210c680 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -24,7 +24,6 @@
#include "content/browser/accessibility/browser_accessibility_manager.h"
#include "content/browser/android/content_view_core_impl_observer.h"
#include "content/browser/renderer_host/delegated_frame_evictor.h"
-#include "content/browser/renderer_host/ime_adapter_android.h"
#include "content/browser/renderer_host/input/stylus_text_selector.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/browser/renderer_host/text_input_manager.h"
@@ -51,6 +50,7 @@ struct DidOverscrollParams;
namespace content {
class ContentViewCoreImpl;
+class ImeAdapterAndroid;
class OverscrollControllerAndroid;
class RenderWidgetHost;
class RenderWidgetHostImpl;
@@ -222,6 +222,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
void SendMouseEvent(const ui::MotionEventAndroid&, int action_button);
void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event);
void SendGestureEvent(const blink::WebGestureEvent& event);
+ void ConnectImeAdapter(ImeAdapterAndroid* ime_adapter);
void OnStartContentIntent(const GURL& content_url, bool is_main_frame);
@@ -231,8 +232,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
void SetDoubleTapSupportEnabled(bool enabled);
void SetMultiTouchZoomSupportEnabled(bool enabled);
- long GetNativeImeAdapter();
-
void WasResized();
bool HasValidFrame() const;
@@ -267,7 +266,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
void OnTextSelectionChanged(TextInputManager* text_input_manager,
RenderWidgetHostViewBase* updated_view) override;
- ImeAdapterAndroid* ime_adapter_for_testing() { return &ime_adapter_android_; }
+ ImeAdapterAndroid* ime_adapter_for_testing() { return ime_adapter_android_; }
// Exposed for tests.
cc::SurfaceId SurfaceIdForTesting() const override;
@@ -350,7 +349,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
// ContentViewCoreImpl is our interface to the view system.
ContentViewCoreImpl* content_view_core_;
- ImeAdapterAndroid ime_adapter_android_;
+ ImeAdapterAndroid* ime_adapter_android_;
// Body background color of the underlying document.
SkColor cached_background_color_;

Powered by Google App Engine
This is Rietveld 408576698