projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 11.39.250.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
browser
/
renderer_host
/
render_widget_host_view_aura.h
diff --git
a/src/content/browser/renderer_host/render_widget_host_view_aura.h
b/src/content/browser/renderer_host/render_widget_host_view_aura.h
index
cfc928e
..
93a31d8
100644
(file)
--- a/
src/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/
src/content/browser/renderer_host/render_widget_host_view_aura.h
@@
-35,8
+35,6
@@
#include "ui/wm/public/activation_change_observer.h"
#include "ui/wm/public/activation_delegate.h"
#include "ui/wm/public/activation_change_observer.h"
#include "ui/wm/public/activation_delegate.h"
-struct ViewHostMsg_TextInputState_Params;
-
namespace aura {
class WindowTracker;
namespace client {
namespace aura {
class WindowTracker;
namespace client {
@@
-135,6
+133,7
@@
class CONTENT_EXPORT RenderWidgetHostViewAura
explicit RenderWidgetHostViewAura(RenderWidgetHost* host);
// RenderWidgetHostView implementation.
explicit RenderWidgetHostViewAura(RenderWidgetHost* host);
// RenderWidgetHostView implementation.
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
virtual void SetSize(const gfx::Size& size) OVERRIDE;
virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
virtual void SetSize(const gfx::Size& size) OVERRIDE;
@@
-167,8
+166,9
@@
class CONTENT_EXPORT RenderWidgetHostViewAura
virtual void Blur() OVERRIDE;
virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;
virtual void SetIsLoading(bool is_loading) OVERRIDE;
virtual void Blur() OVERRIDE;
virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;
virtual void SetIsLoading(bool is_loading) OVERRIDE;
- virtual void TextInputStateChanged(
- const ViewHostMsg_TextInputState_Params& params) OVERRIDE;
+ virtual void TextInputTypeChanged(ui::TextInputType type,
+ ui::TextInputMode input_mode,
+ bool can_compose_inline) OVERRIDE;
virtual void ImeCancelComposition() OVERRIDE;
virtual void ImeCompositionRangeChanged(
const gfx::Range& range,
virtual void ImeCancelComposition() OVERRIDE;
virtual void ImeCompositionRangeChanged(
const gfx::Range& range,
@@
-326,6
+326,8
@@
class CONTENT_EXPORT RenderWidgetHostViewAura
virtual void OnHostMoved(const aura::WindowTreeHost* host,
const gfx::Point& new_origin) OVERRIDE;
virtual void OnHostMoved(const aura::WindowTreeHost* host,
const gfx::Point& new_origin) OVERRIDE;
+ void OnTextInputStateChanged(const ViewHostMsg_TextInputState_Params& params);
+
#if defined(OS_WIN)
// Sets the cutout rects from constrained windows. These are rectangles that
// windowed NPAPI plugins shouldn't paint in. Overwrites any previous cutout
#if defined(OS_WIN)
// Sets the cutout rects from constrained windows. These are rectangles that
// windowed NPAPI plugins shouldn't paint in. Overwrites any previous cutout