Update To 11.40.268.0

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

diff --git a/src/chrome/browser/ui/webui/chromeos/power_ui.cc b/src/chrome/browser/ui/webui/chromeos/power_ui.cc
index e9e4e76..bb19652 100644 (file)
--- a/src/chrome/browser/ui/webui/chromeos/power_ui.cc
+++ b/src/chrome/browser/ui/webui/chromeos/power_ui.cc
@@ -43,7 +43,7 @@ class PowerMessageHandler : public content::WebUIMessageHandler {
   virtual ~PowerMessageHandler();
 
   // WebUIMessageHandler implementation.
-  virtual void RegisterMessages() OVERRIDE;
+  virtual void RegisterMessages() override;
 
  private:
   void OnGetBatteryChargeData(const base::ListValue* value);
@@ -187,7 +187,6 @@ PowerUI::PowerUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
 
   content::WebUIDataSource* html =
       content::WebUIDataSource::Create(chrome::kChromeUIPowerHost);
-  html->SetUseJsonJSFormatV2();
 
   html->AddLocalizedString("titleText", IDS_ABOUT_POWER_TITLE);
   html->AddLocalizedString("showButton", IDS_ABOUT_POWER_SHOW_BUTTON);