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

Fix compilation error caused by #2340

Browse source
This commit is contained in:
Cheng Zhao 2015-07-30 10:38:04 +08:00
parent 2d5c0ac9ee
commit 0e779e20c3
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/api/atom_api_session.cc
View file

@ -10,6 +10,7 @@
#include "atom/browser/api/atom_api_cookies.h" #include "atom/browser/api/atom_api_cookies.h"
#include "atom/browser/atom_browser_context.h" #include "atom/browser/atom_browser_context.h"
#include "atom/common/native_mate_converters/gurl_converter.h" #include "atom/common/native_mate_converters/gurl_converter.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/prefs/pref_service.h" #include "base/prefs/pref_service.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
@ -254,9 +255,9 @@ void Session::SetProxy(const std::string& proxy,
base::Bind(&SetProxyInIO, base::Unretained(getter), proxy, callback)); base::Bind(&SetProxyInIO, base::Unretained(getter), proxy, callback));
} }
void Session::SetDownloadPath(const std::string& path) { void Session::SetDownloadPath(const base::FilePath& path) {
browser_context_->prefs()->SetFilePath(prefs::kDownloadDefaultDirectory, browser_context_->prefs()->SetFilePath(
base::FilePath(path)); prefs::kDownloadDefaultDirectory, path);
} }
v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) { v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) {

6
atom/browser/api/atom_api_session.h
View file

@ -17,6 +17,10 @@ namespace mate {
class Arguments; class Arguments;
} }
namespace base {
class FilePath;
}
namespace atom { namespace atom {
class AtomBrowserContext; class AtomBrowserContext;
@ -46,7 +50,7 @@ class Session: public mate::TrackableObject<Session> {
void ClearCache(const net::CompletionCallback& callback); void ClearCache(const net::CompletionCallback& callback);
void ClearStorageData(mate::Arguments* args); void ClearStorageData(mate::Arguments* args);
void SetProxy(const std::string& proxy, const base::Closure& callback); void SetProxy(const std::string& proxy, const base::Closure& callback);
void SetDownloadPath(const std::string& path); void SetDownloadPath(const base::FilePath& path);
v8::Local<v8::Value> Cookies(v8::Isolate* isolate); v8::Local<v8::Value> Cookies(v8::Isolate* isolate);
v8::Global<v8::Value> cookies_; v8::Global<v8::Value> cookies_;