More updates: use string instead of integer to identify blocker type.
This commit is contained in:
parent
532f75fcab
commit
13784e6551
4 changed files with 29 additions and 43 deletions
|
@ -4,18 +4,12 @@
|
|||
|
||||
#include "atom/browser/api/atom_api_power_save_blocker.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "content/public/browser/power_save_blocker.h"
|
||||
#include "native_mate/constructor.h"
|
||||
#include "native_mate/dictionary.h"
|
||||
|
||||
#include "atom/common/node_includes.h"
|
||||
|
||||
namespace {
|
||||
|
||||
const char kPowerSaveBlockerDescription[] = "Electron";
|
||||
|
||||
} // namespace
|
||||
|
||||
namespace mate {
|
||||
|
||||
template<>
|
||||
|
@ -24,19 +18,15 @@ struct Converter<content::PowerSaveBlocker::PowerSaveBlockerType> {
|
|||
v8::Local<v8::Value> val,
|
||||
content::PowerSaveBlocker::PowerSaveBlockerType* out) {
|
||||
using content::PowerSaveBlocker;
|
||||
int type;
|
||||
std::string type;
|
||||
if (!ConvertFromV8(isolate, val, &type))
|
||||
return false;
|
||||
switch (static_cast<PowerSaveBlocker::PowerSaveBlockerType>(type)) {
|
||||
case PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension:
|
||||
*out = PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension;
|
||||
break;
|
||||
case PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep:
|
||||
*out = PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep;
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
if (type == "prevent-app-suspension")
|
||||
*out = PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension;
|
||||
else if (type == "prevent-display-sleep")
|
||||
*out = PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep;
|
||||
else
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
@ -47,7 +37,9 @@ namespace atom {
|
|||
|
||||
namespace api {
|
||||
|
||||
PowerSaveBlocker::PowerSaveBlocker() {
|
||||
PowerSaveBlocker::PowerSaveBlocker()
|
||||
: current_blocker_type_(
|
||||
content::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension) {
|
||||
}
|
||||
|
||||
PowerSaveBlocker::~PowerSaveBlocker() {
|
||||
|
@ -81,7 +73,7 @@ void PowerSaveBlocker::UpdatePowerSaveBlocker() {
|
|||
content::PowerSaveBlocker::Create(
|
||||
new_blocker_type,
|
||||
content::PowerSaveBlocker::kReasonOther,
|
||||
kPowerSaveBlockerDescription);
|
||||
ATOM_PRODUCT_NAME);
|
||||
power_save_blocker_.swap(new_blocker);
|
||||
current_blocker_type_ = new_blocker_type;
|
||||
}
|
||||
|
|
|
@ -44,8 +44,8 @@ class PowerSaveBlocker : public mate::Wrappable {
|
|||
content::PowerSaveBlocker::PowerSaveBlockerType current_blocker_type_;
|
||||
|
||||
// Map from id to the corresponding blocker type for each request.
|
||||
typedef std::map<int, content::PowerSaveBlocker::PowerSaveBlockerType>
|
||||
PowerSaveBlockerTypeMap;
|
||||
using PowerSaveBlockerTypeMap =
|
||||
std::map<int, content::PowerSaveBlocker::PowerSaveBlockerType>;
|
||||
PowerSaveBlockerTypeMap power_save_blocker_types_;
|
||||
|
||||
|
||||
|
|
|
@ -1,8 +1,3 @@
|
|||
bindings = process.atomBinding 'power_save_blocker'
|
||||
|
||||
powerSaveBlocker = bindings.powerSaveBlocker
|
||||
|
||||
powerSaveBlocker.PREVENT_APP_SUSPENSION = 0
|
||||
powerSaveBlocker.PREVENT_DISPLAY_SLEEP = 1
|
||||
|
||||
module.exports = powerSaveBlocker
|
||||
module.exports = bindings.powerSaveBlocker
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue