diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-16 04:56:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-16 04:56:06 +0000 |
| commit | 6b0349ef4ab90a6b99fc568f40e872a7f2ca39c9 (patch) | |
| tree | 9ba478afe564003c74927c1530741846f6aa1336 /net/proxy | |
| parent | b679032aef9317482f87ceaf67ee138aaa67a152 (diff) | |
| download | chromium_src-6b0349ef4ab90a6b99fc568f40e872a7f2ca39c9.zip chromium_src-6b0349ef4ab90a6b99fc568f40e872a7f2ca39c9.tar.gz chromium_src-6b0349ef4ab90a6b99fc568f40e872a7f2ca39c9.tar.bz2 | |
Move xdg_util into base/nix. I originally wanted to use base/linux, but you
can't have a namespace called "linux" because it's ifdefed by GCC to be a
number. Same for "unix". "x11" was discarded because some future stuff in
here will not be related to x11.
This also renames base_paths_posix to base_paths_linux since this does not
apply to mac, and normally posix applies to mac (this confused me when I had to
edit it for the XDG stuff).
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3778007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_config_service_linux.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index fe82e24..3d8c3ce 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -25,7 +25,7 @@ #include "base/string_util.h" #include "base/task.h" #include "base/timer.h" -#include "base/xdg_util.h" +#include "base/nix/xdg_util.h" #include "googleurl/src/url_canon.h" #include "net/base/net_errors.h" #include "net/http/http_util.h" @@ -442,8 +442,8 @@ class GConfSettingGetterImplKDE if (!env_var_getter->GetVar(base::env_vars::kHome, &home)) // User has no $HOME? Give up. Later we'll report the failure. return; - if (base::GetDesktopEnvironment(env_var_getter) == - base::DESKTOP_ENVIRONMENT_KDE3) { + if (base::nix::GetDesktopEnvironment(env_var_getter) == + base::nix::DESKTOP_ENVIRONMENT_KDE3) { // KDE3 always uses .kde for its configuration. FilePath kde_path = FilePath(home).Append(".kde"); kde_config_dir_ = KDEHomeToConfigPath(kde_path); @@ -1062,16 +1062,16 @@ ProxyConfigServiceLinux::Delegate::Delegate(base::Environment* env_var_getter) : env_var_getter_(env_var_getter), glib_default_loop_(NULL), io_loop_(NULL) { // Figure out which GConfSettingGetterImpl to use, if any. - switch (base::GetDesktopEnvironment(env_var_getter)) { - case base::DESKTOP_ENVIRONMENT_GNOME: + switch (base::nix::GetDesktopEnvironment(env_var_getter)) { + case base::nix::DESKTOP_ENVIRONMENT_GNOME: gconf_getter_.reset(new GConfSettingGetterImplGConf()); break; - case base::DESKTOP_ENVIRONMENT_KDE3: - case base::DESKTOP_ENVIRONMENT_KDE4: + case base::nix::DESKTOP_ENVIRONMENT_KDE3: + case base::nix::DESKTOP_ENVIRONMENT_KDE4: gconf_getter_.reset(new GConfSettingGetterImplKDE(env_var_getter)); break; - case base::DESKTOP_ENVIRONMENT_XFCE: - case base::DESKTOP_ENVIRONMENT_OTHER: + case base::nix::DESKTOP_ENVIRONMENT_XFCE: + case base::nix::DESKTOP_ENVIRONMENT_OTHER: break; } } |