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

3 files changed, 15 insertions, 15 deletions

diff --git a/chrome/browser/gtk/gconf_titlebar_listener.cc b/chrome/browser/gtk/gconf_titlebar_listener.cc
index b33ab17..671c197b 100644
--- a/chrome/browser/gtk/gconf_titlebar_listener.cc
+++ b/chrome/browser/gtk/gconf_titlebar_listener.cc
@@ -8,7 +8,7 @@
 
 #include "base/scoped_ptr.h"
 #include "base/environment.h"
-#include "base/xdg_util.h"
+#include "base/nix/xdg_util.h"
 #include "chrome/browser/gtk/browser_titlebar.h"
 
 namespace {
@@ -46,8 +46,8 @@ void GConfTitlebarListener::RemoveObserver(BrowserTitlebar* titlebar) {
 
 GConfTitlebarListener::GConfTitlebarListener() : client_(NULL) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
-  if (base::GetDesktopEnvironment(env.get()) ==
-      base::DESKTOP_ENVIRONMENT_GNOME) {
+  if (base::nix::GetDesktopEnvironment(env.get()) ==
+      base::nix::DESKTOP_ENVIRONMENT_GNOME) {
     client_ = gconf_client_get_default();
     // If we fail to get a context, that's OK, since we'll just fallback on
     // not receiving gconf keys.
diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc
index 5bcd8a3..4a6b0c9 100644
--- a/chrome/browser/gtk/gtk_theme_provider.cc
+++ b/chrome/browser/gtk/gtk_theme_provider.cc
@@ -12,7 +12,7 @@
 #include "app/resource_bundle.h"
 #include "base/environment.h"
 #include "base/stl_util-inl.h"
-#include "base/xdg_util.h"
+#include "base/nix/xdg_util.h"
 #include "chrome/browser/gtk/cairo_cached_surface.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/hover_controller_gtk.h"
@@ -552,9 +552,9 @@ GdkPixbuf* GtkThemeProvider::GetDefaultFavicon(bool native) {
 bool GtkThemeProvider::DefaultUsesSystemTheme() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
-  switch (base::GetDesktopEnvironment(env.get())) {
-    case base::DESKTOP_ENVIRONMENT_GNOME:
-    case base::DESKTOP_ENVIRONMENT_XFCE:
+  switch (base::nix::GetDesktopEnvironment(env.get())) {
+    case base::nix::DESKTOP_ENVIRONMENT_GNOME:
+    case base::nix::DESKTOP_ENVIRONMENT_XFCE:
       return true;
     default:
       return false;
diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc
index 343f9bd..fa1c1c9 100644
--- a/chrome/browser/gtk/options/advanced_contents_gtk.cc
+++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc
@@ -20,7 +20,7 @@
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_tokenizer.h"
-#include "base/xdg_util.h"
+#include "base/nix/xdg_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
@@ -429,8 +429,8 @@ void NetworkSection::OnChangeProxiesButtonClicked(GtkButton *button,
 
   ProxyConfigCommand command;
   bool found_command = false;
-  switch (base::GetDesktopEnvironment(env.get())) {
-    case base::DESKTOP_ENVIRONMENT_GNOME: {
+  switch (base::nix::GetDesktopEnvironment(env.get())) {
+    case base::nix::DESKTOP_ENVIRONMENT_GNOME: {
       size_t index;
       ProxyConfigCommand commands[2];
       commands[0].argv = kGNOMEProxyConfigCommand;
@@ -441,25 +441,25 @@ void NetworkSection::OnChangeProxiesButtonClicked(GtkButton *button,
       break;
     }
 
-    case base::DESKTOP_ENVIRONMENT_KDE3:
+    case base::nix::DESKTOP_ENVIRONMENT_KDE3:
       command.argv = kKDE3ProxyConfigCommand;
       found_command = SearchPATH(&command, 1, NULL);
       break;
 
-    case base::DESKTOP_ENVIRONMENT_KDE4:
+    case base::nix::DESKTOP_ENVIRONMENT_KDE4:
       command.argv = kKDE4ProxyConfigCommand;
       found_command = SearchPATH(&command, 1, NULL);
       break;
 
-    case base::DESKTOP_ENVIRONMENT_XFCE:
-    case base::DESKTOP_ENVIRONMENT_OTHER:
+    case base::nix::DESKTOP_ENVIRONMENT_XFCE:
+    case base::nix::DESKTOP_ENVIRONMENT_OTHER:
       break;
   }
 
   if (found_command) {
     StartProxyConfigUtil(section->profile(), command);
   } else {
-    const char* name = base::GetDesktopEnvironmentName(env.get());
+    const char* name = base::nix::GetDesktopEnvironmentName(env.get());
     if (name)
       LOG(ERROR) << "Could not find " << name << " network settings in $PATH";
     browser::ShowOptionsURL(section->profile(), GURL(kLinuxProxyConfigUrl));