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

Fix building on Windows

Browse source
This commit is contained in:
Cheng Zhao 2015-11-13 13:23:13 +08:00
parent d3caea91b0
commit fdc19f2d3a
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
chromium_src/chrome/common/chrome_paths_win.cc
View file

@ -15,9 +15,6 @@
#include "base/win/metro.h" #include "base/win/metro.h"
#include "base/win/scoped_co_mem.h" #include "base/win/scoped_co_mem.h"
#include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/installer/util/browser_distribution.h"
#include "components/nacl/common/nacl_switches.h"
namespace chrome { namespace chrome {
@ -43,12 +40,7 @@ bool GetUserDirectory(int csidl_folder, base::FilePath* result) {
} // namespace } // namespace
bool GetDefaultUserDataDirectory(base::FilePath* result) { bool GetDefaultUserDataDirectory(base::FilePath* result) {
if (!PathService::Get(base::DIR_LOCAL_APP_DATA, result)) return PathService::Get(base::DIR_LOCAL_APP_DATA, result);
return false;
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
*result = result->Append(dist->GetInstallSubDir());
*result = result->Append(chrome::kUserDataDirname);
return true;
} }
void GetUserCacheDirectory(const base::FilePath& profile_dir, void GetUserCacheDirectory(const base::FilePath& profile_dir,
@ -106,16 +98,9 @@ bool ProcessNeedsProfileDir(const std::string& process_type) {
// service processes to be able to use the profile directory because if it // service processes to be able to use the profile directory because if it
// lies on a network share the sandbox will prevent us from accessing it. // lies on a network share the sandbox will prevent us from accessing it.
if (process_type.empty() || process_type == switches::kServiceProcess) if (process_type.empty())
return true; return true;
#if !defined(DISABLE_NACL)
if (process_type == switches::kNaClBrokerProcess ||
process_type == switches::kNaClLoaderProcess) {
return true;
}
#endif
return false; return false;
} }