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

Unified Diff: ui/base/ime/text_input_focus_manager.cc

Issue 354513002: A couple of changes that make views work from multiple threads (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: usage Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/views/views_init_internal.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/text_input_focus_manager.cc
diff --git a/ui/base/ime/text_input_focus_manager.cc b/ui/base/ime/text_input_focus_manager.cc
index 4fd7dcffb3ca95f43b1ab439d5faf38c8ec3bc50..25033d8cb32d4200547f775822ff426e8014425c 100644
--- a/ui/base/ime/text_input_focus_manager.cc
+++ b/ui/base/ime/text_input_focus_manager.cc
@@ -9,26 +9,30 @@
namespace ui {
+// TODO(sky): reenable these DCHECKs. We're in the process of enabling usage
+// of views from multiple threads and this causes problems. See
+// http://crbug.com/388045 for details.
+
TextInputFocusManager* TextInputFocusManager::GetInstance() {
TextInputFocusManager* instance = Singleton<TextInputFocusManager>::get();
- DCHECK(instance->thread_checker_.CalledOnValidThread());
+ // DCHECK(instance->thread_checker_.CalledOnValidThread());
return instance;
}
TextInputClient* TextInputFocusManager::GetFocusedTextInputClient() {
- DCHECK(thread_checker_.CalledOnValidThread());
+ // DCHECK(thread_checker_.CalledOnValidThread());
return focused_text_input_client_;
}
void TextInputFocusManager::FocusTextInputClient(
TextInputClient* text_input_client) {
- DCHECK(thread_checker_.CalledOnValidThread());
+ // DCHECK(thread_checker_.CalledOnValidThread());
focused_text_input_client_ = text_input_client;
}
void TextInputFocusManager::BlurTextInputClient(
TextInputClient* text_input_client) {
- DCHECK(thread_checker_.CalledOnValidThread());
+ // DCHECK(thread_checker_.CalledOnValidThread());
if (focused_text_input_client_ == text_input_client)
focused_text_input_client_ = NULL;
}
« no previous file with comments | « mojo/views/views_init_internal.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698