summaryrefslogtreecommitdiffstats
path: root/ash/root_window_controller.cc
diff options
context:
space:
mode:
authoryukishiino <yukishiino@chromium.org>2015-01-27 20:31:12 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-28 04:32:19 +0000
commit907eabfaac97bcf997667debe79a5688ced0cb45 (patch)
tree0424071706468e43f6e34550b349678f518cd743 /ash/root_window_controller.cc
parent4a8dee9ac9fd757f776f76a651d921f347305e82 (diff)
downloadchromium_src-907eabfaac97bcf997667debe79a5688ced0cb45.zip
chromium_src-907eabfaac97bcf997667debe79a5688ced0cb45.tar.gz
chromium_src-907eabfaac97bcf997667debe79a5688ced0cb45.tar.bz2
text input focus: Supports Window::GetFocusedTextInputClient.
This CL is split off from http://crrev.com/785463002 and Window::GetFocusedTextInputClient is necessary in that CL. BUG=290701 Review URL: https://codereview.chromium.org/860983004 Cr-Commit-Position: refs/heads/master@{#313448}
Diffstat (limited to 'ash/root_window_controller.cc')
-rw-r--r--ash/root_window_controller.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 226013f..1e1c5bd 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -221,6 +221,7 @@ class EmptyWindowDelegate : public aura::WindowDelegate {
gfx::Size GetMaximumSize() const override { return gfx::Size(); }
void OnBoundsChanged(const gfx::Rect& old_bounds,
const gfx::Rect& new_bounds) override {}
+ ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
gfx::NativeCursor GetCursor(const gfx::Point& point) override {
return gfx::kNullCursor;
}