Commit 27d61f3a authored by yusukes@chromium.org's avatar yusukes@chromium.org

Remove IME support from chromeos/login/html_page_screen.cc.

BUG=chromium-os:27837
TEST=ran try


Review URL: http://codereview.chromium.org/9699067

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126896 0039d316-1c4b-4281-b951-d872f2087c98
parent 1a21e32a
...@@ -6,9 +6,6 @@ ...@@ -6,9 +6,6 @@
#include "base/string_util.h" #include "base/string_util.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/input_method/input_method_util.h"
#include "chrome/browser/chromeos/login/screen_observer.h" #include "chrome/browser/chromeos/login/screen_observer.h"
#include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_manager.h"
#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host.h"
...@@ -71,14 +68,6 @@ void HTMLPageScreen::OnNetworkTimeout() { ...@@ -71,14 +68,6 @@ void HTMLPageScreen::OnNetworkTimeout() {
VLOG(1) << "HTMLPageScreen::OnNetworkTimeout"; VLOG(1) << "HTMLPageScreen::OnNetworkTimeout";
// Just show what we have now. We shouldn't exit from the screen on timeout. // Just show what we have now. We shouldn't exit from the screen on timeout.
StopTimeoutTimer(); StopTimeoutTimer();
// Enable input methods (e.g. Chinese, Japanese) so that users could input
// their first and last names.
if (g_browser_process) {
const std::string locale = g_browser_process->GetApplicationLocale();
input_method::InputMethodManager* manager =
input_method::InputMethodManager::GetInstance();
manager->EnableInputMethods(locale, input_method::kAllInputMethods, "");
}
view()->ShowPageContent(); view()->ShowPageContent();
} }
...@@ -86,14 +75,6 @@ void HTMLPageScreen::OnNetworkTimeout() { ...@@ -86,14 +75,6 @@ void HTMLPageScreen::OnNetworkTimeout() {
// HTMLPageScreen, private: // HTMLPageScreen, private:
void HTMLPageScreen::CloseScreen(ScreenObserver::ExitCodes code) { void HTMLPageScreen::CloseScreen(ScreenObserver::ExitCodes code) {
StopTimeoutTimer(); StopTimeoutTimer();
// Disable input methods since they are not necessary to input username and
// password.
if (g_browser_process) {
const std::string locale = g_browser_process->GetApplicationLocale();
input_method::InputMethodManager* manager =
input_method::InputMethodManager::GetInstance();
manager->EnableInputMethods(locale, input_method::kKeyboardLayoutsOnly, "");
}
delegate()->GetObserver()->OnExit(code); delegate()->GetObserver()->OnExit(code);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment