Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / chromeos / proxy_settings_ui.cc

diff --git a/src/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/src/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
index e6f37a0..606acc4 100644 (file)
--- a/src/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
+++ b/src/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
@@ -92,15 +92,15 @@ ProxySettingsUI::ProxySettingsUI(content::WebUI* web_ui)
   // |localized_strings| will be owned by ProxySettingsHTMLSource.
   base::DictionaryValue* localized_strings = new base::DictionaryValue();
 
+  web_ui->AddMessageHandler(core_handler_);
   core_handler_->set_handlers_host(this);
   core_handler_->GetLocalizedValues(localized_strings);
-  web_ui->AddMessageHandler(core_handler_);
 
-  proxy_handler_->GetLocalizedValues(localized_strings);
   web_ui->AddMessageHandler(proxy_handler_);
+  proxy_handler_->GetLocalizedValues(localized_strings);
 
   bool keyboard_driven_oobe =
-      system::keyboard_settings::ForceKeyboardDrivenUINavigation();
+      system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation();
   localized_strings->SetString("highlightStrength",
                                keyboard_driven_oobe ? "strong" : "normal");