OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
6 #include "base/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
7 #include "testing/gtest/include/gtest/gtest.h" | 7 #include "testing/gtest/include/gtest/gtest.h" |
8 #include "ui/aura/client/focus_client.h" | 8 #include "ui/aura/client/focus_client.h" |
9 #include "ui/aura/root_window.h" | 9 #include "ui/aura/root_window.h" |
10 #include "ui/aura/test/aura_test_helper.h" | 10 #include "ui/aura/test/aura_test_helper.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 virtual void ConfirmCompositionText() OVERRIDE {} | 116 virtual void ConfirmCompositionText() OVERRIDE {} |
117 virtual void ClearCompositionText() OVERRIDE {} | 117 virtual void ClearCompositionText() OVERRIDE {} |
118 virtual void InsertText(const base::string16& text) OVERRIDE {} | 118 virtual void InsertText(const base::string16& text) OVERRIDE {} |
119 virtual void InsertChar(base::char16 ch, int flags) OVERRIDE {} | 119 virtual void InsertChar(base::char16 ch, int flags) OVERRIDE {} |
120 virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE { | 120 virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE { |
121 return static_cast<gfx::NativeWindow>(NULL); | 121 return static_cast<gfx::NativeWindow>(NULL); |
122 } | 122 } |
123 virtual ui::TextInputType GetTextInputType() const OVERRIDE { | 123 virtual ui::TextInputType GetTextInputType() const OVERRIDE { |
124 return type_; | 124 return type_; |
125 } | 125 } |
| 126 virtual ui::TextInputMode GetTextInputMode() const OVERRIDE { |
| 127 return ui::TEXT_INPUT_MODE_DEFAULT; |
| 128 } |
126 virtual bool CanComposeInline() const OVERRIDE { return false; } | 129 virtual bool CanComposeInline() const OVERRIDE { return false; } |
127 virtual gfx::Rect GetCaretBounds() OVERRIDE { return gfx::Rect(); } | 130 virtual gfx::Rect GetCaretBounds() OVERRIDE { return gfx::Rect(); } |
128 | 131 |
129 virtual bool GetCompositionCharacterBounds(uint32 index, | 132 virtual bool GetCompositionCharacterBounds(uint32 index, |
130 gfx::Rect* rect) OVERRIDE { | 133 gfx::Rect* rect) OVERRIDE { |
131 return false; | 134 return false; |
132 } | 135 } |
133 virtual bool HasCompositionText() OVERRIDE { return false; } | 136 virtual bool HasCompositionText() OVERRIDE { return false; } |
134 virtual bool GetTextRange(ui::Range* range) OVERRIDE { return false; } | 137 virtual bool GetTextRange(ui::Range* range) OVERRIDE { return false; } |
135 virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE { | 138 virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE { |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 EXPECT_TRUE(keyboard_container->IsVisible()); | 282 EXPECT_TRUE(keyboard_container->IsVisible()); |
280 | 283 |
281 input_method->SetFocusedTextInputClient(&no_input_client); | 284 input_method->SetFocusedTextInputClient(&no_input_client); |
282 EXPECT_FALSE(keyboard_container->IsVisible()); | 285 EXPECT_FALSE(keyboard_container->IsVisible()); |
283 | 286 |
284 input_method->SetFocusedTextInputClient(&input_client); | 287 input_method->SetFocusedTextInputClient(&input_client); |
285 EXPECT_TRUE(keyboard_container->IsVisible()); | 288 EXPECT_TRUE(keyboard_container->IsVisible()); |
286 } | 289 } |
287 | 290 |
288 } // namespace keyboard | 291 } // namespace keyboard |
OLD | NEW |