• Darren Shen's avatar
    Reland "[VK] Change KeyboardController::GetInstance to never return null." · f62db77a
    Darren Shen authored
    This is a reland of eb29c355
    
    Had to change InputMethodManagerImpl::GetInputMethodKeyboardController
    to return nullptr when the keyboard is disabled. Seems like the memory
    error was from using a disabled keyboard.
    
    TBR=jamescook@chromium.org, yusukes@chromium.org, sky@chromium.org, yhanada@chromium.org
    
    Original change's description:
    > [VK] Change KeyboardController::GetInstance to never return null.
    >
    > Currently, KeyboardController::GetInstance returns null if the keyboard
    > is disabled. This patch changes it so that |GetInstance| always returns
    > a valid KeyboardController.
    >
    > However, existing code determines whether the keyboard is enabled by
    > checking whether KeyboardController is null or not. With this patch,
    > KeyboardController will never be null. So we have to replace the null
    > checks with calls to KeyboardController::enabled(). In some cases,
    > calls to KeyboardController::enabled() can be omitted, but we leave
    > that to a future patch for easier review.
    >
    > Bug: 731537
    > Change-Id: Ica487e69bae0a589d79c726f131611f0bf934672
    > Reviewed-on: https://chromium-review.googlesource.com/1032230
    > Commit-Queue: Darren Shen <shend@chromium.org>
    > Reviewed-by: Yusuke Sato <yusukes@chromium.org>
    > Reviewed-by: Yuichiro Hanada <yhanada@chromium.org>
    > Reviewed-by: Scott Violet <sky@chromium.org>
    > Reviewed-by: James Cook <jamescook@chromium.org>
    > Cr-Commit-Position: refs/heads/master@{#564779}
    
    Bug: 731537
    Change-Id: Ifea3cea2c801c27e0d1182c2b3f02b788cd24fe0
    Reviewed-on: https://chromium-review.googlesource.com/1089950Reviewed-by: default avatarDarren Shen <shend@chromium.org>
    Commit-Queue: Darren Shen <shend@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#565201}
    f62db77a
keyboard_ui.cc 2.11 KB