| Index: content/browser/renderer_host/render_widget_host_view_aura.h
|
| ===================================================================
|
| --- content/browser/renderer_host/render_widget_host_view_aura.h (revision 113258)
|
| +++ content/browser/renderer_host/render_widget_host_view_aura.h (working copy)
|
| @@ -11,7 +11,6 @@
|
| #include "content/browser/renderer_host/render_widget_host_view.h"
|
| #include "content/common/content_export.h"
|
| #include "ui/aura/window_delegate.h"
|
| -#include "ui/base/ime/text_input_client.h"
|
| #include "ui/gfx/compositor/compositor_observer.h"
|
| #include "webkit/glue/webcursor.h"
|
|
|
| @@ -20,10 +19,6 @@
|
| #include "base/memory/ref_counted.h"
|
| #endif
|
|
|
| -namespace ui {
|
| -class InputMethod;
|
| -}
|
| -
|
| namespace WebKit {
|
| class WebTouchEvent;
|
| }
|
| @@ -37,7 +32,6 @@
|
| #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
|
| public ui::CompositorObserver,
|
| #endif
|
| - public ui::TextInputClient,
|
| public aura::WindowDelegate {
|
| public:
|
| explicit RenderWidgetHostViewAura(RenderWidgetHost* host);
|
| @@ -80,8 +74,6 @@
|
| int error_code) OVERRIDE;
|
| virtual void Destroy() OVERRIDE;
|
| virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE;
|
| - virtual void SelectionBoundsChanged(const gfx::Rect& start_rect,
|
| - const gfx::Rect& end_rect) OVERRIDE;
|
| virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;
|
| virtual void OnAcceleratedCompositingStateChange() OVERRIDE;
|
| virtual void AcceleratedSurfaceBuffersSwapped(
|
| @@ -111,27 +103,6 @@
|
| virtual bool LockMouse() OVERRIDE;
|
| virtual void UnlockMouse() OVERRIDE;
|
|
|
| - // Overridden from ui::TextInputClient:
|
| - virtual void SetCompositionText(
|
| - const ui::CompositionText& composition) OVERRIDE;
|
| - virtual void ConfirmCompositionText() OVERRIDE;
|
| - virtual void ClearCompositionText() OVERRIDE;
|
| - virtual void InsertText(const string16& text) OVERRIDE;
|
| - virtual void InsertChar(char16 ch, int flags) OVERRIDE;
|
| - virtual ui::TextInputType GetTextInputType() const OVERRIDE;
|
| - virtual gfx::Rect GetCaretBounds() OVERRIDE;
|
| - virtual bool HasCompositionText() OVERRIDE;
|
| - virtual bool GetTextRange(ui::Range* range) OVERRIDE;
|
| - virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE;
|
| - virtual bool GetSelectionRange(ui::Range* range) OVERRIDE;
|
| - virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE;
|
| - virtual bool DeleteRange(const ui::Range& range) OVERRIDE;
|
| - virtual bool GetTextFromRange(const ui::Range& range,
|
| - string16* text) OVERRIDE;
|
| - virtual void OnInputMethodChanged() OVERRIDE;
|
| - virtual bool ChangeTextDirectionAndLayoutAlignment(
|
| - base::i18n::TextDirection direction) OVERRIDE;
|
| -
|
| // Overridden from aura::WindowDelegate:
|
| virtual gfx::Size GetMinimumSize() const OVERRIDE;
|
| virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
|
| @@ -161,12 +132,7 @@
|
|
|
| void UpdateCursorIfOverSelf();
|
| void UpdateExternalTexture();
|
| - ui::InputMethod* GetInputMethod();
|
|
|
| - // Confirm existing composition text in the webpage and ask the input method
|
| - // to cancel its ongoing composition session.
|
| - void FinishImeCompositionSession();
|
| -
|
| // The model object.
|
| RenderWidgetHost* host_;
|
|
|
| @@ -189,16 +155,6 @@
|
| // removed from the list on an ET_TOUCH_RELEASED event.
|
| WebKit::WebTouchEvent touch_event_;
|
|
|
| - // The current text input type.
|
| - ui::TextInputType text_input_type_;
|
| -
|
| - // Rectangles before and after the selection.
|
| - gfx::Rect selection_start_rect_;
|
| - gfx::Rect selection_end_rect_;
|
| -
|
| - // Indicates if there is onging composition text.
|
| - bool has_composition_text_;
|
| -
|
| // Current tooltip text.
|
| string16 tooltip_;
|
|
|
|
|