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

content::BrowserContext::GetPath is a const member function in Chrome 30

Browse source 
See http://src.chromium.org/viewvc/chrome?view=revision&revision=211931.
This commit is contained in:
Adam Roben 2013-10-07 15:21:43 -04:00
parent 64a5ce6e15
commit eb446fc707
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
brightray/browser/browser_context.cc
View file

@ -51,6 +51,18 @@ BrowserContext::BrowserContext() : resource_context_(new ResourceContext) {
} }
void BrowserContext::Initialize() { void BrowserContext::Initialize() {
base::FilePath path;
#if defined(OS_LINUX)
scoped_ptr<base::Environment> env(base::Environment::Create());
path = base::nix::GetXDGDirectory(env.get(),
base::nix::kXdgConfigHomeEnvVar,
base::nix::kDotConfigDir);
#else
CHECK(PathService::Get(base::DIR_APP_DATA, &path));
#endif
path_ = path.Append(base::FilePath::FromUTF8Unsafe(GetApplicationName()));
auto prefs_path = GetPath().Append(FILE_PATH_LITERAL("Preferences")); auto prefs_path = GetPath().Append(FILE_PATH_LITERAL("Preferences"));
PrefServiceBuilder builder; PrefServiceBuilder builder;
builder.WithUserFilePrefs(prefs_path, builder.WithUserFilePrefs(prefs_path,
@ -86,21 +98,7 @@ scoped_ptr<NetworkDelegate> BrowserContext::CreateNetworkDelegate() {
return make_scoped_ptr(new NetworkDelegate).Pass(); return make_scoped_ptr(new NetworkDelegate).Pass();
} }
base::FilePath BrowserContext::GetPath() { base::FilePath BrowserContext::GetPath() const {
if (!path_.empty())
return path_;
base::FilePath path;
#if defined(OS_LINUX)
scoped_ptr<base::Environment> env(base::Environment::Create());
path = base::nix::GetXDGDirectory(env.get(),
base::nix::kXdgConfigHomeEnvVar,
base::nix::kDotConfigDir);
#else
CHECK(PathService::Get(base::DIR_APP_DATA, &path));
#endif
path_ = path.Append(base::FilePath::FromUTF8Unsafe(GetApplicationName()));
return path_; return path_;
} }

2
brightray/browser/browser_context.h
View file

@ -35,7 +35,7 @@ protected:
// Subclasses should override this to provide a custom NetworkDelegate implementation. // Subclasses should override this to provide a custom NetworkDelegate implementation.
virtual scoped_ptr<NetworkDelegate> CreateNetworkDelegate(); virtual scoped_ptr<NetworkDelegate> CreateNetworkDelegate();
virtual base::FilePath GetPath() OVERRIDE; virtual base::FilePath GetPath() const OVERRIDE;
private: private:
class ResourceContext; class ResourceContext;