Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: chrome/browser/chromeos/input_method/textinput_test_helper.cc

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "ash/shell.h" 5 #include "ash/shell.h"
6 #include "base/string_util.h" 6 #include "base/string_util.h"
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/chromeos/input_method/textinput_test_helper.h" 9 #include "chrome/browser/chromeos/input_method/textinput_test_helper.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 } 68 }
69 69
70 ui::TextInputClient* TextInputTestHelper::GetTextInputClient() const { 70 ui::TextInputClient* TextInputTestHelper::GetTextInputClient() const {
71 return GetInputMethod()->GetTextInputClient(); 71 return GetInputMethod()->GetTextInputClient();
72 } 72 }
73 73
74 void TextInputTestHelper::OnTextInputTypeChanged( 74 void TextInputTestHelper::OnTextInputTypeChanged(
75 const ui::TextInputClient* client) { 75 const ui::TextInputClient* client) {
76 latest_text_input_type_ = client->GetTextInputType(); 76 latest_text_input_type_ = client->GetTextInputType();
77 if (waiting_type_ == WAIT_ON_TEXT_INPUT_TYPE_CHANGED) 77 if (waiting_type_ == WAIT_ON_TEXT_INPUT_TYPE_CHANGED)
78 MessageLoop::current()->Quit(); 78 base::MessageLoop::current()->Quit();
79 } 79 }
80 80
81 void TextInputTestHelper::OnInputMethodDestroyed( 81 void TextInputTestHelper::OnInputMethodDestroyed(
82 const ui::InputMethod* input_method) { 82 const ui::InputMethod* input_method) {
83 } 83 }
84 84
85 void TextInputTestHelper::OnFocus() { 85 void TextInputTestHelper::OnFocus() {
86 focus_state_ = true; 86 focus_state_ = true;
87 if (waiting_type_ == WAIT_ON_FOCUS) 87 if (waiting_type_ == WAIT_ON_FOCUS)
88 MessageLoop::current()->Quit(); 88 base::MessageLoop::current()->Quit();
89 } 89 }
90 90
91 void TextInputTestHelper::OnBlur() { 91 void TextInputTestHelper::OnBlur() {
92 focus_state_ = false; 92 focus_state_ = false;
93 if (waiting_type_ == WAIT_ON_BLUR) 93 if (waiting_type_ == WAIT_ON_BLUR)
94 MessageLoop::current()->Quit(); 94 base::MessageLoop::current()->Quit();
95 } 95 }
96 96
97 void TextInputTestHelper::OnCaretBoundsChanged( 97 void TextInputTestHelper::OnCaretBoundsChanged(
98 const ui::TextInputClient* client) { 98 const ui::TextInputClient* client) {
99 ui::Range text_range; 99 ui::Range text_range;
100 if (!GetTextInputClient()->GetTextRange(&text_range) || 100 if (!GetTextInputClient()->GetTextRange(&text_range) ||
101 !GetTextInputClient()->GetTextFromRange(text_range, &surrounding_text_) || 101 !GetTextInputClient()->GetTextFromRange(text_range, &surrounding_text_) ||
102 !GetTextInputClient()->GetSelectionRange(&selection_range_)) 102 !GetTextInputClient()->GetSelectionRange(&selection_range_))
103 return; 103 return;
104 if (waiting_type_ == WAIT_ON_CARET_BOUNDS_CHANGED) 104 if (waiting_type_ == WAIT_ON_CARET_BOUNDS_CHANGED)
105 MessageLoop::current()->Quit(); 105 base::MessageLoop::current()->Quit();
106 } 106 }
107 107
108 void TextInputTestHelper::OnTextInputStateChanged( 108 void TextInputTestHelper::OnTextInputStateChanged(
109 const ui::TextInputClient* client) { 109 const ui::TextInputClient* client) {
110 } 110 }
111 111
112 void TextInputTestHelper::WaitForTextInputStateChanged( 112 void TextInputTestHelper::WaitForTextInputStateChanged(
113 ui::TextInputType expected_type) { 113 ui::TextInputType expected_type) {
114 CHECK_EQ(NO_WAIT, waiting_type_); 114 CHECK_EQ(NO_WAIT, waiting_type_);
115 waiting_type_ = WAIT_ON_TEXT_INPUT_TYPE_CHANGED; 115 waiting_type_ = WAIT_ON_TEXT_INPUT_TYPE_CHANGED;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 mouse_event.y = rect.CenterPoint().y(); 194 mouse_event.y = rect.CenterPoint().y();
195 mouse_event.clickCount = 1; 195 mouse_event.clickCount = 1;
196 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); 196 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
197 197
198 mouse_event.type = WebKit::WebInputEvent::MouseUp; 198 mouse_event.type = WebKit::WebInputEvent::MouseUp;
199 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event); 199 tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
200 return true; 200 return true;
201 } 201 }
202 202
203 } // namespace chromeos 203 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698