github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-23 14:28:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Throw error when PathService call failed

Browse Source
This commit is contained in:
Cheng Zhao
2015-01-18 20:24:58 -08:00
parent dec3e37683
commit 3d398458a8
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
atom/browser/api/atom_api_app.cc
View File

@@ -151,18 +151,26 @@ void App::OnFinishLaunching() {
Emit("ready");
}
base::FilePath App::GetPath(const std::string& name) {
base::FilePath App::GetPath(mate::Arguments* args, const std::string& name) {
bool succeed = false;
base::FilePath path;
int key = GetPathConstant(name);
if (key >= 0)
PathService::Get(key, &path);
succeed = PathService::Get(key, &path);
if (!succeed)
args->ThrowError("Failed to get path");
return path;
}
void App::SetPath(const std::string& name, const base::FilePath& path) {
void App::SetPath(mate::Arguments* args,
const std::string& name,
const base::FilePath& path) {
bool succeed = false;
int key = GetPathConstant(name);
if (key >= 0)
PathService::Override(key, path);
succeed = PathService::Override(key, path);
if (!succeed)
args->ThrowError("Failed to set path");
}
void App::ResolveProxy(const GURL& url, ResolveProxyCallback callback) {

12
atom/browser/api/atom_api_app.h
View File

@@ -18,6 +18,10 @@ namespace base {
class FilePath;
}
namespace mate {
class Arguments;
}
namespace atom {
namespace api {
@@ -49,11 +53,11 @@ class App : public mate::EventEmitter,
private:
// Get/Set the pre-defined path in PathService.
base::FilePath GetPath(const std::string& name);
void SetPath(const std::string& name, const base::FilePath& path);
base::FilePath GetPath(mate::Arguments* args, const std::string& name);
void SetPath(mate::Arguments* args,
const std::string& name,
const base::FilePath& path);
void SetDataPath(const base::FilePath& path);
base::FilePath GetDataPath();
void ResolveProxy(const GURL& url, ResolveProxyCallback callback);
void SetDesktopName(const std::string& desktop_name);

2
vendor/brightray vendored

Submodule vendor/brightray updated: 8eb714dac7...f19c269ab9