Index: ui/base/ime/win/tsf_bridge.cc |
diff --git a/ui/base/ime/win/tsf_bridge.cc b/ui/base/ime/win/tsf_bridge.cc |
index 8604a8691c319b42e78a2e3c9c3709e966cc80e7..c60cc6c401a8c84454cc05f54f6ea5c18980b67b 100644 |
--- a/ui/base/ime/win/tsf_bridge.cc |
+++ b/ui/base/ime/win/tsf_bridge.cc |
@@ -124,7 +124,7 @@ TSFBridgeDelegate::~TSFBridgeDelegate() { |
} |
bool TSFBridgeDelegate::Initialize() { |
- DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); |
+ DCHECK_EQ(base::MessageLoop::TYPE_UI, base::MessageLoop::current()->type()); |
if (client_id_ != TF_CLIENTID_NULL) { |
DVLOG(1) << "Already initialized."; |
return false; |
@@ -172,7 +172,7 @@ bool TSFBridgeDelegate::Initialize() { |
} |
void TSFBridgeDelegate::Shutdown() { |
- DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); |
+ DCHECK_EQ(base::MessageLoop::TYPE_UI, base::MessageLoop::current()->type()); |
if (!IsInitialized()) |
return; |
for (TSFDocumentMap::iterator it = tsf_document_map_.begin(); |
@@ -191,7 +191,7 @@ void TSFBridgeDelegate::Shutdown() { |
} |
void TSFBridgeDelegate::OnTextInputTypeChanged(TextInputClient* client) { |
- DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); |
+ DCHECK_EQ(base::MessageLoop::TYPE_UI, base::MessageLoop::current()->type()); |
DCHECK(IsInitialized()); |
if (client != client_) { |
@@ -203,7 +203,7 @@ void TSFBridgeDelegate::OnTextInputTypeChanged(TextInputClient* client) { |
} |
bool TSFBridgeDelegate::CancelComposition() { |
- DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); |
+ DCHECK_EQ(base::MessageLoop::TYPE_UI, base::MessageLoop::current()->type()); |
DCHECK(IsInitialized()); |
base::win::ScopedComPtr<ITfDocumentMgr> focused_document_manager; |
@@ -242,7 +242,7 @@ bool TSFBridgeDelegate::CancelComposition() { |
void TSFBridgeDelegate::SetFocusedClient(HWND focused_window, |
TextInputClient* client) { |
- DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); |
+ DCHECK_EQ(base::MessageLoop::TYPE_UI, base::MessageLoop::current()->type()); |
DCHECK(client); |
DCHECK(IsInitialized()); |
client_ = client; |
@@ -260,7 +260,7 @@ void TSFBridgeDelegate::SetFocusedClient(HWND focused_window, |
} |
void TSFBridgeDelegate::RemoveFocusedClient(TextInputClient* client) { |
- DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); |
+ DCHECK_EQ(base::MessageLoop::TYPE_UI, base::MessageLoop::current()->type()); |
DCHECK(IsInitialized()); |
if (client_ != client) |
return; |
@@ -278,7 +278,7 @@ TextInputClient* TSFBridgeDelegate::GetFocusedTextInputClient() const { |
} |
base::win::ScopedComPtr<ITfThreadMgr> TSFBridgeDelegate::GetThreadManager() { |
- DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); |
+ DCHECK_EQ(base::MessageLoop::TYPE_UI, base::MessageLoop::current()->type()); |
DCHECK(IsInitialized()); |
return thread_manager_; |
} |
@@ -439,7 +439,7 @@ TSFBridge::~TSFBridge() { |
// static |
bool TSFBridge::Initialize() { |
- if (MessageLoop::current()->type() != MessageLoop::TYPE_UI) { |
+ if (base::MessageLoop::current()->type() != base::MessageLoop::TYPE_UI) { |
DVLOG(1) << "Do not use TSFBridge without UI thread."; |
return false; |
} |
@@ -454,7 +454,7 @@ bool TSFBridge::Initialize() { |
// static |
TSFBridge* TSFBridge::ReplaceForTesting(TSFBridge* bridge) { |
- if (MessageLoop::current()->type() != MessageLoop::TYPE_UI) { |
+ if (base::MessageLoop::current()->type() != base::MessageLoop::TYPE_UI) { |
DVLOG(1) << "Do not use TSFBridge without UI thread."; |
return NULL; |
} |
@@ -465,7 +465,7 @@ TSFBridge* TSFBridge::ReplaceForTesting(TSFBridge* bridge) { |
// static |
TSFBridge* TSFBridge::GetInstance() { |
- if (MessageLoop::current()->type() != MessageLoop::TYPE_UI) { |
+ if (base::MessageLoop::current()->type() != base::MessageLoop::TYPE_UI) { |
DVLOG(1) << "Do not use TSFBridge without UI thread."; |
return NULL; |
} |