mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Wire everything up

Browse source
This commit is contained in:
Paul Betts 2015-10-19 16:21:03 -07:00
parent c38f2fcf75
commit cdd51fa96d
4 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/api/atom_api_app.h
View file

@ -9,6 +9,7 @@
#include "atom/browser/api/event_emitter.h"
#include "atom/browser/browser_observer.h"
#include "atom/browser/process_singleton.h"
#include "atom/common/native_mate_converters/callback.h"
#include "content/public/browser/gpu_data_manager_observer.h"
#include "native_mate/handle.h"
@ -25,8 +26,6 @@ namespace atom {
namespace api {
using SingleInstanceCallback = base::Callback<void(const std::string&)>;
class App : public mate::EventEmitter,
public BrowserObserver,
public content::GpuDataManagerObserver {
@ -70,8 +69,8 @@ class App : public mate::EventEmitter,
void SetAppUserModelId(const std::string& app_id);
void AllowNTLMCredentialsForAllDomains(bool should_allow);
bool MakeSingleInstance(const SingleInstanceCallback& callback);
bool MakeSingleInstance(const ProcessSingleton::NotificationCallback& callback);
std::string GetLocale();
v8::Local<v8::Value> DefaultSession(v8::Isolate* isolate);