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

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

Issue 389913002: Moving IME manifests to chrome resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed duplicated XKB extension loading. Created 6 years, 5 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
Index: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index f450837b0502c3eacacfd78a1f842294766df27e..47cb912b3188b4fe6d7715dc74b26171534b399b 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -74,14 +74,12 @@ NetworkScreenHandler::NetworkScreenHandler(CoreOobeActor* core_oobe_actor)
core_oobe_actor_(core_oobe_actor),
is_continue_enabled_(false),
show_on_init_(false),
- should_reinitialize_language_keyboard_list_(false),
weak_ptr_factory_(this) {
DCHECK(core_oobe_actor_);
input_method::InputMethodManager* manager =
input_method::InputMethodManager::Get();
manager->AddObserver(this);
- manager->GetComponentExtensionIMEManager()->AddObserver(this);
}
NetworkScreenHandler::~NetworkScreenHandler() {
@@ -91,7 +89,6 @@ NetworkScreenHandler::~NetworkScreenHandler() {
input_method::InputMethodManager* manager =
input_method::InputMethodManager::Get();
manager->RemoveObserver(this);
- manager->GetComponentExtensionIMEManager()->RemoveObserver(this);
}
// NetworkScreenHandler, NetworkScreenActor implementation: --------------------
@@ -213,11 +210,6 @@ void NetworkScreenHandler::Initialize() {
Show();
}
- if (should_reinitialize_language_keyboard_list_) {
- should_reinitialize_language_keyboard_list_ = false;
- ReloadLocalizedContent();
- }
-
timezone_subscription_ = CrosSettings::Get()->AddSettingsObserver(
kSystemTimezone,
base::Bind(&NetworkScreenHandler::OnSystemTimezoneChanged,
@@ -330,15 +322,6 @@ void NetworkScreenHandler::OnSystemTimezoneChanged() {
CallJS("setTimezone", current_timezone_id);
}
-void NetworkScreenHandler::OnImeComponentExtensionInitialized() {
- // Refreshes the language and keyboard list once the component extension
- // IMEs are initialized.
- if (page_is_ready())
- ReloadLocalizedContent();
- else
- should_reinitialize_language_keyboard_list_ = true;
-}
-
void NetworkScreenHandler::InputMethodChanged(
input_method::InputMethodManager* manager, bool show_message) {
CallJS("setInputMethod", manager->GetCurrentInputMethod().id());

Powered by Google App Engine
This is Rietveld 408576698