| Index: base/path_service.cc
|
| diff --git a/base/path_service.cc b/base/path_service.cc
|
| index 3c437ee74930aa99f2bfb532d5f78954187632ae..0dc0e1d2a7cbacda254fa01af14ce7fca4d650b8 100644
|
| --- a/base/path_service.cc
|
| +++ b/base/path_service.cc
|
| @@ -4,12 +4,6 @@
|
|
|
| #include "base/path_service.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include <windows.h>
|
| -#include <shellapi.h>
|
| -#include <shlobj.h>
|
| -#endif
|
| -
|
| #include "base/containers/hash_tables.h"
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| @@ -22,9 +16,7 @@ using base::MakeAbsoluteFilePath;
|
|
|
| namespace base {
|
| bool PathProvider(int key, FilePath* result);
|
| -#if defined(OS_WIN)
|
| - bool PathProviderWin(int key, FilePath* result);
|
| -#elif defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX)
|
| bool PathProviderMac(int key, FilePath* result);
|
| #elif defined(OS_ANDROID)
|
| bool PathProviderAndroid(int key, FilePath* result);
|
| @@ -61,18 +53,6 @@ Provider base_provider = {
|
| true
|
| };
|
|
|
| -#if defined(OS_WIN)
|
| -Provider base_provider_win = {
|
| - base::PathProviderWin,
|
| - &base_provider,
|
| -#ifndef NDEBUG
|
| - base::PATH_WIN_START,
|
| - base::PATH_WIN_END,
|
| -#endif
|
| - true
|
| -};
|
| -#endif
|
| -
|
| #if defined(OS_MACOSX)
|
| Provider base_provider_mac = {
|
| base::PathProviderMac,
|
| @@ -118,9 +98,7 @@ struct PathData {
|
| bool cache_disabled; // Don't use cache if true;
|
|
|
| PathData() : cache_disabled(false) {
|
| -#if defined(OS_WIN)
|
| - providers = &base_provider_win;
|
| -#elif defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX)
|
| providers = &base_provider_mac;
|
| #elif defined(OS_ANDROID)
|
| providers = &base_provider_android;
|
|
|