X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fui%2Fwebui%2Fchromeos%2Fproxy_settings_ui.cc;h=606acc40ec9c004c368b347a14c73ee6246eadee;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=e6f37a0c29e2b03a46667f03dcb116584a7d8f5b;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

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
--- 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");