From fdc19f2d3a16e703fbcc6985a4a98673a0292936 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 13 Nov 2015 13:23:13 +0800 Subject: [PATCH] Fix building on Windows --- .../chrome/common/chrome_paths_win.cc | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/chromium_src/chrome/common/chrome_paths_win.cc b/chromium_src/chrome/common/chrome_paths_win.cc index 18073ca04759..37f4ec2b05bd 100644 --- a/chromium_src/chrome/common/chrome_paths_win.cc +++ b/chromium_src/chrome/common/chrome_paths_win.cc @@ -15,9 +15,6 @@ #include "base/win/metro.h" #include "base/win/scoped_co_mem.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 { @@ -43,12 +40,7 @@ bool GetUserDirectory(int csidl_folder, base::FilePath* result) { } // namespace bool GetDefaultUserDataDirectory(base::FilePath* result) { - if (!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; + return PathService::Get(base::DIR_LOCAL_APP_DATA, result); } 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 // 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; -#if !defined(DISABLE_NACL) - if (process_type == switches::kNaClBrokerProcess || - process_type == switches::kNaClLoaderProcess) { - return true; - } -#endif - return false; }