[M47_2526] Chromium upversion to m47_2526 branch

[platform/framework/web/chromium-efl.git] / tizen_src / chromium_impl / device / battery / battery_status_manager_tizen.cc

diff --git a/tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.cc b/tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.cc
index 457f4e3..b658a73 100644 (file)
--- a/tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.cc
+++ b/tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.cc
@@ -189,9 +189,13 @@ int BatteryStatusManagerTizen::GetRemainingTimeUntilFullyCharged(
     int* time) const {
   DCHECK(time != NULL);
   bool charging = false;
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14521
   if (device_battery_is_charging(&charging) != DEVICE_ERROR_NONE ||
       charging == false)
     return DEVICE_ERROR_OPERATION_FAILED;
+#endif
 
   int temp_time = 0;
   if (vconf_get_int(VCONFKEY_PM_BATTERY_TIMETOFULL, &temp_time) < 0 ||
@@ -206,9 +210,13 @@ int BatteryStatusManagerTizen::GetRemainingTimeUntilDischarged(
     int* time) const {
   DCHECK(time != NULL);
   bool charging = false;
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14521
   if (device_battery_is_charging(&charging) != DEVICE_ERROR_NONE ||
       charging == true)
     return DEVICE_ERROR_OPERATION_FAILED;
+#endif
 
   int temp_time = 0;
   if (vconf_get_int(VCONFKEY_PM_BATTERY_TIMETOEMPTY, time) < 0 ||
@@ -222,7 +230,11 @@ int BatteryStatusManagerTizen::GetRemainingTimeUntilDischarged(
 bool BatteryStatusManagerTizen::StartListeningBatteryChange() {
   if (vconf_notify_key_changed(
           VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW, OnChargingStatusChanged, this) ||
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14521
       device_battery_set_cb(OnLevelChanged, this) != DEVICE_ERROR_NONE ||
+#endif
       SetRemainingTimeUntilFullyChargedCb(OnChargingTimeChanged, this)
           != DEVICE_ERROR_NONE ||
       SetRemainingTimeUntilDischargedCb(OnDischargingTimeChanged, this)
@@ -236,7 +248,11 @@ bool BatteryStatusManagerTizen::StartListeningBatteryChange() {
     return false;
 
   int level = 0, charging_time = 0, discharging_time = 0;
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14521
   device_battery_get_percent(&level);
+#endif
   GetRemainingTimeUntilFullyCharged(&charging_time);
   GetRemainingTimeUntilDischarged(&discharging_time);
 
@@ -256,7 +272,11 @@ void BatteryStatusManagerTizen::StopListeningBatteryChange() {
   UnsetRemainingTimeUntilDischargedCb();
   vconf_ignore_key_changed(VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW,
       OnChargingStatusChanged);
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14521
   device_battery_unset_cb();
+#endif
 }
 
 }  // namespace device