OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/web_contents/touch_editable_impl_aura.h" | 5 #include "content/browser/web_contents/touch_editable_impl_aura.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 NavigateToURL(shell(), test_url); | 145 NavigateToURL(shell(), test_url); |
146 aura::Window* content = shell()->web_contents()->GetContentNativeView(); | 146 aura::Window* content = shell()->web_contents()->GetContentNativeView(); |
147 content->GetHost()->SetBounds(gfx::Rect(800, 600)); | 147 content->GetHost()->SetBounds(gfx::Rect(800, 600)); |
148 } | 148 } |
149 | 149 |
150 RenderWidgetHostViewAura* GetRenderWidgetHostViewAura( | 150 RenderWidgetHostViewAura* GetRenderWidgetHostViewAura( |
151 TouchEditableImplAura* touch_editable) { | 151 TouchEditableImplAura* touch_editable) { |
152 return touch_editable->rwhva_; | 152 return touch_editable->rwhva_; |
153 } | 153 } |
154 | 154 |
155 ui::TouchSelectionController* GetTouchSelectionController( | 155 ui::TouchEditingControllerDeprecated* GetTouchSelectionController( |
156 TouchEditableImplAura* touch_editable) { | 156 TouchEditableImplAura* touch_editable) { |
157 return touch_editable->touch_selection_controller_.get(); | 157 return touch_editable->touch_selection_controller_.get(); |
158 } | 158 } |
159 | 159 |
160 ui::TextInputType GetTextInputType(TouchEditableImplAura* touch_editable) { | 160 ui::TextInputType GetTextInputType(TouchEditableImplAura* touch_editable) { |
161 return touch_editable->text_input_type_; | 161 return touch_editable->text_input_type_; |
162 } | 162 } |
163 | 163 |
164 private: | 164 private: |
165 wm::DefaultScreenPositionClient screen_position_client_; | 165 wm::DefaultScreenPositionClient screen_position_client_; |
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
459 value = content::ExecuteScriptAndGetValue(main_frame, | 459 value = content::ExecuteScriptAndGetValue(main_frame, |
460 "get_cursor_position()"); | 460 "get_cursor_position()"); |
461 int new_cursor_pos = -1; | 461 int new_cursor_pos = -1; |
462 value->GetAsInteger(&new_cursor_pos); | 462 value->GetAsInteger(&new_cursor_pos); |
463 EXPECT_NE(-1, new_cursor_pos); | 463 EXPECT_NE(-1, new_cursor_pos); |
464 // Cursor should have moved. | 464 // Cursor should have moved. |
465 EXPECT_NE(new_cursor_pos, cursor_pos); | 465 EXPECT_NE(new_cursor_pos, cursor_pos); |
466 } | 466 } |
467 | 467 |
468 } // namespace content | 468 } // namespace content |
OLD | NEW |