diff options
Diffstat (limited to 'chromium/ui/aura/client')
| -rw-r--r-- | chromium/ui/aura/client/aura_constants.cc | 1 | ||||
| -rw-r--r-- | chromium/ui/aura/client/aura_constants.h | 5 | ||||
| -rw-r--r-- | chromium/ui/aura/client/cursor_client.h | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/chromium/ui/aura/client/aura_constants.cc b/chromium/ui/aura/client/aura_constants.cc index 39e304b1ef7..3fa9141b582 100644 --- a/chromium/ui/aura/client/aura_constants.cc +++ b/chromium/ui/aura/client/aura_constants.cc @@ -72,6 +72,7 @@ DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr) DEFINE_UI_CLASS_PROPERTY_KEY(ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT) +DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSkipImeProcessing, false) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16, kTitleKey, nullptr) DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr) diff --git a/chromium/ui/aura/client/aura_constants.h b/chromium/ui/aura/client/aura_constants.h index 30c090399b9..138069130a8 100644 --- a/chromium/ui/aura/client/aura_constants.h +++ b/chromium/ui/aura/client/aura_constants.h @@ -137,6 +137,11 @@ AURA_EXPORT extern const WindowProperty<gfx::Rect*>* const kRestoreBoundsKey; AURA_EXPORT extern const WindowProperty<ui::WindowShowState>* const kShowStateKey; +// A property key to store key event dispatch policy. The default value is +// false, which means IME receives a key event in PREDISPATCH phace before a +// window receives it. If it's true, a window receives a key event before IME. +AURA_EXPORT extern const WindowProperty<bool>* const kSkipImeProcessing; + // A property key to store the title of the window; sometimes shown to users. AURA_EXPORT extern const WindowProperty<base::string16*>* const kTitleKey; diff --git a/chromium/ui/aura/client/cursor_client.h b/chromium/ui/aura/client/cursor_client.h index ed6076995da..076ec1ab8bb 100644 --- a/chromium/ui/aura/client/cursor_client.h +++ b/chromium/ui/aura/client/cursor_client.h @@ -33,6 +33,11 @@ class AURA_EXPORT CursorClient { // Returns the current cursor. virtual gfx::NativeCursor GetCursor() const = 0; + // Forces the cursor to be updated. This is called when the system may have + // changed the cursor without the cursor client's knowledge, which breaks + // if the cursor client doesn't think the cursor has changed. + virtual void SetCursorForced(gfx::NativeCursor cursor) = 0; + // Shows the cursor. This does not take effect When mouse events are disabled. virtual void ShowCursor() = 0; |