Infinite Linting
This commit is contained in:
parent
f759471e01
commit
4a7a09aae1
6 changed files with 14 additions and 10 deletions
|
@ -276,11 +276,12 @@ bool App::MakeSingleInstance(v8::Local<v8::Function> callback) {
|
|||
browser->InitializeSingleInstance();
|
||||
|
||||
ProcessSingleton::NotificationCallback cb;
|
||||
mate::Converter<ProcessSingleton::NotificationCallback>::FromV8(isolate(), single_instance_callback_, &cb);
|
||||
mate::Converter<ProcessSingleton::NotificationCallback>::FromV8(
|
||||
isolate(), single_instance_callback_, &cb);
|
||||
|
||||
browser->SetSingleInstanceCallback(cb);
|
||||
|
||||
switch(browser->GetSingleInstanceResult()) {
|
||||
switch (browser->GetSingleInstanceResult()) {
|
||||
case ProcessSingleton::NotifyResult::PROCESS_NONE:
|
||||
return false;
|
||||
case ProcessSingleton::NotifyResult::LOCK_ERROR:
|
||||
|
|
|
@ -71,7 +71,7 @@ class App : public mate::EventEmitter,
|
|||
void AllowNTLMCredentialsForAllDomains(bool should_allow);
|
||||
|
||||
bool MakeSingleInstance(v8::Local<v8::Function> callback);
|
||||
|
||||
|
||||
std::string GetLocale();
|
||||
v8::Local<v8::Value> DefaultSession(v8::Isolate* isolate);
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ class AtomProcessSingleton {
|
|||
AtomProcessSingleton(
|
||||
const base::FilePath& user_data_dir,
|
||||
const ProcessSingleton::NotificationCallback& notification_callback);
|
||||
|
||||
|
||||
~AtomProcessSingleton();
|
||||
|
||||
// Notify another process, if available. Otherwise sets ourselves as the
|
||||
|
|
|
@ -117,7 +117,7 @@ void Browser::WillFinishLaunching() {
|
|||
|
||||
void Browser::DidFinishLaunching() {
|
||||
is_ready_ = true;
|
||||
process_singleton_->Unlock() ;
|
||||
process_singleton_->Unlock();
|
||||
FOR_EACH_OBSERVER(BrowserObserver, observers_, OnFinishLaunching());
|
||||
}
|
||||
|
||||
|
@ -174,7 +174,8 @@ ProcessSingleton::NotifyResult Browser::GetSingleInstanceResult() {
|
|||
return process_notify_result_;
|
||||
}
|
||||
|
||||
void Browser::SetSingleInstanceCallback(ProcessSingleton::NotificationCallback callback) {
|
||||
void Browser::SetSingleInstanceCallback(
|
||||
ProcessSingleton::NotificationCallback callback) {
|
||||
process_notify_callback_ = callback;
|
||||
process_notify_callback_set_ = true;
|
||||
}
|
||||
|
|
|
@ -68,7 +68,8 @@ class Browser : public WindowListObserver {
|
|||
|
||||
void InitializeSingleInstance();
|
||||
ProcessSingleton::NotifyResult GetSingleInstanceResult();
|
||||
void SetSingleInstanceCallback(ProcessSingleton::NotificationCallback callback);
|
||||
void SetSingleInstanceCallback(
|
||||
ProcessSingleton::NotificationCallback callback);
|
||||
|
||||
#if defined(OS_MACOSX)
|
||||
// Bounce the dock icon.
|
||||
|
|
|
@ -16,13 +16,14 @@ template<>
|
|||
struct Converter<base::CommandLine> {
|
||||
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||
const base::CommandLine& val) {
|
||||
return Converter<base::CommandLine::StringType>::ToV8(isolate, val.GetCommandLineString());
|
||||
return Converter<base::CommandLine::StringType>::ToV8(
|
||||
isolate, val.GetCommandLineString());
|
||||
}
|
||||
static bool FromV8(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> val,
|
||||
base::CommandLine* out) {
|
||||
base::FilePath::StringType path;
|
||||
|
||||
|
||||
if (Converter<base::FilePath::StringType>::FromV8(isolate, val, &path)) {
|
||||
*out = base::CommandLine(base::FilePath(path));
|
||||
return true;
|
||||
|
@ -34,4 +35,4 @@ struct Converter<base::CommandLine> {
|
|||
|
||||
} // namespace mate
|
||||
|
||||
#endif // ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
|
||||
#endif // ATOM_COMMON_NATIVE_MATE_CONVERTERS_COMMAND_LINE_CONVERTER_H_
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue