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

Unified Diff: views/ime/input_method_base.cc

Issue 8491035: Revert 109583 - Move views/ime/text_input_client.h to ui/base/ime/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | « views/ime/input_method_base.h ('k') | views/ime/input_method_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/ime/input_method_base.cc
===================================================================
--- views/ime/input_method_base.cc (revision 109585)
+++ views/ime/input_method_base.cc (working copy)
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/ime/text_input_client.h"
#include "views/ime/input_method_base.h"
#include "views/ime/text_input_type_tracker.h"
#include "views/view.h"
@@ -71,13 +70,13 @@
}
}
-ui::TextInputClient* InputMethodBase::GetTextInputClient() const {
+TextInputClient* InputMethodBase::GetTextInputClient() const {
return (widget_focused_ && GetFocusedView()) ?
GetFocusedView()->GetTextInputClient() : NULL;
}
ui::TextInputType InputMethodBase::GetTextInputType() const {
- ui::TextInputClient* client = GetTextInputClient();
+ TextInputClient* client = GetTextInputClient();
return client ? client->GetTextInputType() : ui::TEXT_INPUT_TYPE_NONE;
}
@@ -104,7 +103,7 @@
}
void InputMethodBase::OnInputMethodChanged() const {
- ui::TextInputClient* client = GetTextInputClient();
+ TextInputClient* client = GetTextInputClient();
if (client && client->GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE)
client->OnInputMethodChanged();
}
@@ -116,7 +115,7 @@
bool InputMethodBase::GetCaretBoundsInWidget(gfx::Rect* rect) const {
DCHECK(rect);
- ui::TextInputClient* client = GetTextInputClient();
+ TextInputClient* client = GetTextInputClient();
if (!client || client->GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE)
return false;
« no previous file with comments | « views/ime/input_method_base.h ('k') | views/ime/input_method_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698