| Index: ui/keyboard/keyboard_util.h
|
| diff --git a/ui/keyboard/keyboard_util.h b/ui/keyboard/keyboard_util.h
|
| index ce4df68484c72fd70c9a8c52cf8d2b7c969a490c..d7f5d59e299cecab5d530f760b89761bdd40bb95 100644
|
| --- a/ui/keyboard/keyboard_util.h
|
| +++ b/ui/keyboard/keyboard_util.h
|
| @@ -62,87 +62,87 @@ enum KeyboardState {
|
| // Gets the calculated keyboard bounds from |root_bounds|. The keyboard height
|
| // is specified by |keyboard_height|. This should be only called when keyboard
|
| // is in FULL_WDITH mode.
|
| -KEYBOARD_EXPORT gfx::Rect FullWidthKeyboardBoundsFromRootBounds(
|
| + gfx::Rect FullWidthKeyboardBoundsFromRootBounds(
|
| const gfx::Rect& root_bounds, int keyboard_height);
|
|
|
| // Sets the state of the a11y onscreen keyboard.
|
| -KEYBOARD_EXPORT void SetAccessibilityKeyboardEnabled(bool enabled);
|
| + void SetAccessibilityKeyboardEnabled(bool enabled);
|
|
|
| // Gets the state of the a11y onscreen keyboard.
|
| -KEYBOARD_EXPORT bool GetAccessibilityKeyboardEnabled();
|
| + bool GetAccessibilityKeyboardEnabled();
|
|
|
| // Sets the state of the hotrod onscreen keyboard.
|
| -KEYBOARD_EXPORT void SetHotrodKeyboardEnabled(bool enabled);
|
| + void SetHotrodKeyboardEnabled(bool enabled);
|
|
|
| // Gets the state of the hotrod onscreen keyboard.
|
| -KEYBOARD_EXPORT bool GetHotrodKeyboardEnabled();
|
| + bool GetHotrodKeyboardEnabled();
|
|
|
| // Sets the state of the touch onscreen keyboard.
|
| -KEYBOARD_EXPORT void SetTouchKeyboardEnabled(bool enabled);
|
| + void SetTouchKeyboardEnabled(bool enabled);
|
|
|
| // Gets the state of the touch onscreen keyboard.
|
| -KEYBOARD_EXPORT bool GetTouchKeyboardEnabled();
|
| + bool GetTouchKeyboardEnabled();
|
|
|
| // Sets the requested state of the keyboard.
|
| -KEYBOARD_EXPORT void SetRequestedKeyboardState(KeyboardState state);
|
| + void SetRequestedKeyboardState(KeyboardState state);
|
|
|
| // Gets the requested state of the keyboard.
|
| -KEYBOARD_EXPORT int GetRequestedKeyboardState();
|
| + int GetRequestedKeyboardState();
|
|
|
| // Gets the default keyboard layout.
|
| -KEYBOARD_EXPORT std::string GetKeyboardLayout();
|
| + std::string GetKeyboardLayout();
|
|
|
| // Returns true if the virtual keyboard is enabled.
|
| -KEYBOARD_EXPORT bool IsKeyboardEnabled();
|
| + bool IsKeyboardEnabled();
|
|
|
| // Returns true if smart deployment of the virtual keyboard is enabled.
|
| -KEYBOARD_EXPORT bool IsSmartDeployEnabled();
|
| + bool IsSmartDeployEnabled();
|
|
|
| // Returns true if keyboard overscroll mode is enabled.
|
| -KEYBOARD_EXPORT bool IsKeyboardOverscrollEnabled();
|
| + bool IsKeyboardOverscrollEnabled();
|
|
|
| // Sets temporary keyboard overscroll override.
|
| -KEYBOARD_EXPORT void SetKeyboardOverscrollOverride(
|
| + void SetKeyboardOverscrollOverride(
|
| KeyboardOverscrolOverride override);
|
|
|
| // Sets policy override on whether to show the keyboard.
|
| -KEYBOARD_EXPORT void SetKeyboardShowOverride(KeyboardShowOverride override);
|
| + void SetKeyboardShowOverride(KeyboardShowOverride override);
|
|
|
| // Returns true if an IME extension can specify a custom input view for the
|
| // virtual keyboard window.
|
| -KEYBOARD_EXPORT bool IsInputViewEnabled();
|
| + bool IsInputViewEnabled();
|
|
|
| // Sets whehther the keyboards is in restricted state - state where advanced
|
| // virtual keyboard features are disabled.
|
| -KEYBOARD_EXPORT void SetKeyboardRestricted(bool restricted);
|
| + void SetKeyboardRestricted(bool restricted);
|
|
|
| // Returns whether the keyboard is in restricted state.
|
| -KEYBOARD_EXPORT bool GetKeyboardRestricted();
|
| + bool GetKeyboardRestricted();
|
|
|
| // Returns true if experimental features are enabled for IME input-views.
|
| -KEYBOARD_EXPORT bool IsExperimentalInputViewEnabled();
|
| + bool IsExperimentalInputViewEnabled();
|
|
|
| // Returns true if floating virtual keyboard feature is enabled.
|
| -KEYBOARD_EXPORT bool IsFloatingVirtualKeyboardEnabled();
|
| + bool IsFloatingVirtualKeyboardEnabled();
|
|
|
| // Returns true if gesture typing option is enabled for virtual keyboard.
|
| -KEYBOARD_EXPORT bool IsGestureTypingEnabled();
|
| + bool IsGestureTypingEnabled();
|
|
|
| // Returns true if gesture editing option is enabled for virtual keyboard.
|
| -KEYBOARD_EXPORT bool IsGestureEditingEnabled();
|
| + bool IsGestureEditingEnabled();
|
|
|
| // Returns true if voice input is not disabled for the keyboard by the command
|
| // line switch. It's up to the client to check if there is an input device
|
| // available.
|
| -KEYBOARD_EXPORT bool IsVoiceInputEnabled();
|
| + bool IsVoiceInputEnabled();
|
|
|
| // Insert |text| into the active TextInputClient if there is one. Returns true
|
| // if |text| was successfully inserted.
|
| -KEYBOARD_EXPORT bool InsertText(const base::string16& text);
|
| + bool InsertText(const base::string16& text);
|
|
|
| // Move cursor when swipe on the virtualkeyboard. Returns true if cursor was
|
| // successfully moved according to |swipe_direction|.
|
| -KEYBOARD_EXPORT bool MoveCursor(int swipe_direction,
|
| + bool MoveCursor(int swipe_direction,
|
| int modifier_flags,
|
| aura::WindowTreeHost* host);
|
|
|
| @@ -152,7 +152,7 @@ KEYBOARD_EXPORT bool MoveCursor(int swipe_direction,
|
| // specification, and |modifier| indicates if any modifier keys are being
|
| // virtually pressed. The event is dispatched to the active TextInputClient
|
| // associated with |root_window|. The type may be "keydown" or "keyup".
|
| -KEYBOARD_EXPORT bool SendKeyEvent(std::string type,
|
| + bool SendKeyEvent(std::string type,
|
| int key_value,
|
| int key_code,
|
| std::string key_name,
|
| @@ -162,24 +162,24 @@ KEYBOARD_EXPORT bool SendKeyEvent(std::string type,
|
| // Marks that the keyboard load has started. This is used to measure the time it
|
| // takes to fully load the keyboard. This should be called before
|
| // MarkKeyboardLoadFinished.
|
| -KEYBOARD_EXPORT void MarkKeyboardLoadStarted();
|
| + void MarkKeyboardLoadStarted();
|
|
|
| // Marks that the keyboard load has ended. This finishes measuring that the
|
| // keyboard is loaded.
|
| -KEYBOARD_EXPORT void MarkKeyboardLoadFinished();
|
| + void MarkKeyboardLoadFinished();
|
|
|
| // Sets the override content url.
|
| // This is used by for input view for extension IMEs.
|
| -KEYBOARD_EXPORT void SetOverrideContentUrl(const GURL& url);
|
| + void SetOverrideContentUrl(const GURL& url);
|
|
|
| // Gets the override content url.
|
| -KEYBOARD_EXPORT const GURL& GetOverrideContentUrl();
|
| + const GURL& GetOverrideContentUrl();
|
|
|
| // Logs the keyboard control event as a UMA stat.
|
| void LogKeyboardControlEvent(KeyboardControlEvent event);
|
|
|
| // Sets true if keyboard overscrolling is enabled with accessibility keyboard.
|
| -KEYBOARD_EXPORT void SetOverscrollEnabledWithAccessibilityKeyboard(
|
| + void SetOverscrollEnabledWithAccessibilityKeyboard(
|
| bool enabled);
|
|
|
| } // namespace keyboard
|
|
|