| Index: content/browser/browser_plugin/test_browser_plugin_guest.h
|
| diff --git a/content/browser/browser_plugin/test_browser_plugin_guest.h b/content/browser/browser_plugin/test_browser_plugin_guest.h
|
| index a66e86b26c49ee5966f4f95ece895398b02a4175..1ef7f0dbecfe29eba96901144d1b722368fd2e24 100644
|
| --- a/content/browser/browser_plugin/test_browser_plugin_guest.h
|
| +++ b/content/browser/browser_plugin/test_browser_plugin_guest.h
|
| @@ -37,6 +37,7 @@ class TestBrowserPluginGuest : public BrowserPluginGuest {
|
| virtual void SetDamageBuffer(
|
| const BrowserPluginHostMsg_ResizeGuest_Params& params) OVERRIDE;
|
| virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE;
|
| + virtual void OnImeCancelComposition() OVERRIDE;
|
|
|
| // Overridden from WebContentsObserver.
|
| virtual void WasHidden() OVERRIDE;
|
| @@ -64,6 +65,8 @@ class TestBrowserPluginGuest : public BrowserPluginGuest {
|
| void WaitForLoadStop();
|
| // Waits until UpdateRect with a particular |view_size| is observed.
|
| void WaitForViewSize(const gfx::Size& view_size);
|
| + // Waits until IME cancellation is observed.
|
| + void WaitForImeCancel();
|
|
|
| void set_guest_hang_timeout(const base::TimeDelta& timeout) {
|
| guest_hang_timeout_ = timeout;
|
| @@ -83,6 +86,7 @@ class TestBrowserPluginGuest : public BrowserPluginGuest {
|
| bool set_damage_buffer_observed_;
|
| bool input_observed_;
|
| bool load_stop_observed_;
|
| + bool ime_cancel_observed_;
|
| gfx::Size last_view_size_observed_;
|
| gfx::Size expected_auto_view_size_;
|
|
|
| @@ -101,6 +105,7 @@ class TestBrowserPluginGuest : public BrowserPluginGuest {
|
| scoped_refptr<MessageLoopRunner> input_message_loop_runner_;
|
| scoped_refptr<MessageLoopRunner> load_stop_message_loop_runner_;
|
| scoped_refptr<MessageLoopRunner> auto_view_size_message_loop_runner_;
|
| + scoped_refptr<MessageLoopRunner> ime_cancel_message_loop_runner_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestBrowserPluginGuest);
|
| };
|
|
|