| Index: content/browser/renderer_host/render_widget_host_view_aura.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| index 8d07b0dc98afceea66d55ad18f33f22c4801cf14..79f7757c3f75168277a7f69d3937753a83c99429 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| @@ -240,7 +240,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| void ClearCompositionText() override;
|
| void InsertText(const base::string16& text) override;
|
| void InsertChar(base::char16 ch, int flags) override;
|
| - gfx::NativeWindow GetAttachedWindow() const override;
|
| ui::TextInputType GetTextInputType() const override;
|
| ui::TextInputMode GetTextInputMode() const override;
|
| int GetTextInputFlags() const override;
|
| @@ -275,7 +274,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| gfx::Size GetMaximumSize() const override;
|
| void OnBoundsChanged(const gfx::Rect& old_bounds,
|
| const gfx::Rect& new_bounds) override;
|
| - ui::TextInputClient* GetFocusedTextInputClient() override;
|
| gfx::NativeCursor GetCursor(const gfx::Point& point) override;
|
| int GetNonClientComponent(const gfx::Point& point) const override;
|
| bool ShouldDescendIntoChildForEventHandling(
|
| @@ -353,12 +351,12 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| // Called when the context menu is about to be displayed.
|
| void OnShowContextMenu();
|
|
|
| - protected:
|
| - ~RenderWidgetHostViewAura() override;
|
| -
|
| // Exposed for tests.
|
| aura::Window* window() { return window_; }
|
|
|
| + protected:
|
| + ~RenderWidgetHostViewAura() override;
|
| +
|
| DelegatedFrameHost* GetDelegatedFrameHost() const {
|
| return delegated_frame_host_.get();
|
| }
|
|
|